Separate out the spec_helper from the externally available test_support
Add tests for UploadHelpers#upload
Merge changes I65c04512,I43adc178

* changes:
  Add tests for UploadHelpers#upload
  Separate out the spec_helper from the externally available test_support