Working on the tests...