Clean up some test failures.

This makes a start on fixing the issues in [kuma pull 2528](https://github.com/mozilla/kuma/pull/2528). Still one failure, but now it is a failure rather than an error (and the failing test correctly checks the length of the outbox to produce the failure).