Merge "Refactor volume clone tests"