Merge "Refactor volume groups and group snapshots tests"