Merge "Fix skip checks in volume and snapshot manage tests"