Rework all the fixtures (no id's anymore)