Content Uploads: Added tests for non-API code