Fixed the tests some more