Small changes to containers and tests.