Work on the tests