Fixed the tests!