Working on the tests