Simplified code duplication in tests, cleaner code
Comment most code, simplified code
Define relationships in database
User model updated