Added ContainerManagerFactory & more tests