Update container tests for full coverage