More work on the tests