some refactoring of tests
Merge branch 'master' of https://github.com/syncloud/sam