Just testing
Added base tests uploader infrastructure
Removed unnecessary calls to .keys() for dictionary access and interation.