Merge "removes a duplicate volume type test"