Got the tests working better