More feedback: Refactor upload helper, clean tests