More fixes to the tests