Fix tests covering old upload field behaviour