Remove unused imports
Test returns iterator to match implementation
Discarding mock objects for test
Wrap upload in class
Split uploader up into methods