Small fixes
Fixed an ordering issue in the scenario tests