Get the tests working correctly