Fix tests, and a corner case when bouncing an old server.

Signed-off-by: Daira Hopwood <daira@leastauthority.com>
Repair a test.

Signed-off-by: Daira Hopwood <daira@leastauthority.com>
Remove commented-out code.

Signed-off-by: Daira Hopwood <daira@leastauthority.com>