refactored container tests