Improve tests for upload!