add unit testing for UploadUtil, minor fixes