add more unit tests, refactor brokers