Fix Scenario tests