Add failing tests for upload and search #2657

Working on a fix now