Rewrite the pub/sub tests. Needs a bit refactor.