More fixes in tests