fixing test cases
Merge pull request #1807 from danmcp/master

Fixing test cases