Refactored users and user factories to contain a little less info to generalize them/make them easier to extend