Add tests for fluid containers