Merge pull request #489 from hhovsepy/sam-1.3

fixed failing tests, removed unnecessary code
added new scenarios in SAM multiclient