Definitely fixed the tests