fixed even more of the tests