More fixes2 in tests