We now have 100% code coverage on this somewhat fiddly code. We also break activity's dependency on server_events.