Merge pull request #163 from hhovsepy/master

merged all my changes of fixed test cases
changed to support cfse and sam