Get the tests working