Merge "Fix volume group test"