renaming of container interface
new unit test and fixes
fixes and ut