added new scenarios for SAM upgrade, fixed failing tests
Merge pull request #486 from hhovsepy/master

added new scenarios for SAM upgrade, fixed failing tests