Fix multipass test
Improve transfer aborting