Got all the tests working