minor fixes to the tests