Test Fixes

- Test fixes
- Minor fixes to broker