Making the test suite give us OK