supplemental changes in eventbroker unit testing.