Fixed more of the tests