Bugfix + Tests
WIP: Container tests