fixed failing tests
Merge pull request #609 from hhovsepy/sam-1.3

fixed failing tests