Merge pull request #1 from Azure/dev

Syncing fork with base
Attributing scenario tests
Merge pull request #93 from gtrifonov/dev

Attributing scenario tests