added tests and fixed some container issued