refactor factories to not be fixtures