fix up broadcast tests
fix up monitor test
revert change