Cleaned up some container test code using ArchetypeContainerType