Fixed the tests that I should have fixed before