Pharaoh: fixed tests for new upload changes