Danliu/testfix

Cleanup test - checkin1
1. Combine the two UploadAndDownloadPackage tests.
2. Delete the never run UploadAndDownloadTestBombPackage test
3. Other minor fixes