fix the tests some more