Updated testuploader tests
Merge branch 'PlasmaSheep-master' of github.com:Wordseer/wordseer_flask into PlasmaSheep-master
Fixed most of the exceptions during testing.