simplified the tests some more