Refactoring to shorten names of container classes.
Refactoring tests.
Adding more transformations for pair containers.