refactored tests to match container changes