Fix fixtures for tests