Fix fixtures
Merge