make container behaviour a bit more consistent
update tests