refactor to support testing topics as well as queues