Refactoring out partials for wines and collections
Refactoring tests