Container test refactoring