Fix failing tests
Add comments outlining support for publish/subscribe