Merge "Enable some volumes v2 tests by sharing codes part2"