fixed the tests...