Fix scenario tests
Add testrun
Merge pull request #1113 from ogail/867

Fix scenario tests