Refactored tests (again)
Set up user with password
Finished adding user model with secure password
Merge branch 'modeling-users' into dev