More resumable upload controller changes, including test