GUAC-935: Add missing headers. Fix test for PubSub.