More fixes for the tests