Merge "Remove isolated z volume test"