Better testing of institutional group changes

Change-Id: I6a04a70caeb08b00a92e1c00cd650a9295cd0561