Updated tests for removal of Container from c.l