[BB,MR]{test after code} - I02 Logic for filling container ainer class implemented, tests adjusted to expect correct formats, code needs refactoring