Fixed the tests to run correctly