added container add/remove and tests