Fixed all the tests, for now!