Fix broken tests caused by the user model and factory