Pulpv2 - User model tests, user model file clean-up.