Better testing of project group changes

Change-Id: I38183f88fb985111522d926b424e06947c3e5412