Adds testing.  Minor changes to User model.