Resolves file upload test for #121
Merge pull request #158 from jbvanzuylen/issue_121

Resolves file upload test for #121
Merge remote-tracking branch 'upstream/master'