Got the tests working