File upload tests updated
Merge pull request #7 from nierob/testfix

File upload tests updated