Fixes file not found errors when running scenario tests in VS
Merge pull request #1839 from christav/ensure-resource-writer-dir-exists

Fixes file not found errors when running scenario tests in VS
More renames - mostly in strings this time
Merge pull request #1841 from christav/scenario-test-fixes

More renames - mostly in strings this time