container test refactor