refactoring - moving from fixtures to factories