Cleaned up User model test a bit