more fixes to the tests