Fix collection dropping/resetting between tests

Optimistically I'm calling this the final solution, after implementing
this, I can't really understand how any of our prior efforts ever got
close (because they never went and actually fixed the server-process
references).