updated all tests and classes except ContainerManagerTest.java