Deal with the case where we need to stash a note multiple times, e.g.
for forward proxying.
Fleshed out the data transfer tests for the simple forward proxy scenario.