Align Container tests with behavior from 37e642.
Merge pull request #97 from smashwilson/cdn-metadata-test

Align Container tests with behavior from 37e642.