Fix broadcast wait blocking behavior
Fix BroadcastActionTest
Move broadcast handling to new class (BroadcastHandler)