Add users tests
Merge branch 'feature/user-models-test' into develop