Scenario loading and more tests