PROJ-148: Modified tests for users
Merge branch 'develop' of https://github.com/Inovitex/fcms into develop