Fix scenario test failures