Fixed the tests...