Further fixes to broadcast test fails