Moving from .create to .build paradigm.
Rename container polymorphic fields to match general pattern.  Add factories for containers.  Cleanup some specs.