changing some fixtures to factories working