Correct volume matching, and associated unit test