Fixing Container tests for step 4