fixes from user model refactor testing