Fix up the unit tests for the new container type definition.