Test fix. Removes UserGroup duplication errors

Change-Id: I691b0b168b35b4c9029af15a588dd20559855417
Merge "Test fix. Removes UserGroup duplication errors" into develop