neatened things up but still not fixed the tests