More fixes for tests