#59 PubSubTest, and 2 fixes