Slight modification of PubsubHelper and Events Mgr tests