FS-20 Added tests
Merge branch 'ServerBranch' of https://github.com/Fides-Storage/Server.git into ServerBranch