Fixed the tests for the scenario calculators