Fixed issue #118
Merge pull request #154 from gideonthomas/issue118

Fixed issue #118
fixed issue #158 - added validation to handle no content being sent in test cases forcing content errors
Merge pull request #159 from yoavgurevich/issue158

fixed issue #158 - added validation to handle no content being sent in t...
Fix Issues #160 - Wrong referencing to fs var