Reverted back to fixtures from factories