more mc.broadcast cleanup

more explicit in testing flow