Some minor changes to the tests