Fixes to unit test cases
Merge branch 'Enterprise_Pilot_1.0' of https://aleckey@github.com/societies/SOCIETIES-Platform.git into Enterprise_Pilot_1.0