Improved the scenario test.