Updated the Scenario tests