key tests
Merge remote-tracking branch 'upstream/master' into bdErrors
test uploading media and ds with key
Merge pull request #10 from bdonald25/bdErrors

More tests for the java testing app. Tests uploading with keys now.