Finish adding tests for the uploader