Different approach to resolving issue #227
Fix both #227 tests
Adding a multiple resolve issue test and fixing it
Adding issue227 test to ScenarioTestSuite
Merge branch 'develop' into bugfix/issue227-2