Fix Scenario tests
Add scenario test
Add scenario test
Apply code review comment
Merge pull request #39 from andrerod/scenario

Add scenario test
Merge pull request #685 from andrerod/dev

Fix Scenario tests