Merge "Replace volume's "test" name with classname as prefix"