Updated tests to match some DB renaming. Fixed group membership flattening test.