simplify
improve tests for subscribing within dispatch loop