template refactoring; added a test for users model
added more tests for user management feature