Fix File uploader and tests