Improve pubsub unittests
Add expiration to events