refactored tests on file uploads to remove lots of copy/paste, more to replace
finalied refactoring all entry uploads in tests