Some minor fixes to the tests