Fix test failures at head. Group uuid code copied from Groups acceptance tests no good in this context. Change-Id: I73abe808d046753d788fb9a42f47ee2025edfdf8