Container fixes, tests passed