Add tests for container