More fixes to tests