Fix up fixtures

Our fixtures are getting confusing.