Fixed upload test.  Also added information to testing.md
Merge pull request #612 from edx/jonahstanley/fix-upload-test

Fixed upload test.  Also added information to testing.md