DRY up container tests.
Merge pull request #4237 from rjackson/dry-container-tests

DRY up container tests.