Fixed the rest of the tests