- Test multi for all applicable connection types - Clean up unused code - Remove redundant long-running pubsub test