Move where cluster.exit is being handled to cut down on the number of subscribers.  Add tests