Allow overriding of this test by other container implementations
Merge remote-tracking branch 'upstream/master'
Merge pull request #67 from holytshirt/master

Allow overriding of this test by other container implementations