Simplify pubsub return values and tests.