More fixes to test