Fixed the tests