Updating tests
Fixed PubSub and supporing modules.