Change brokerrouter to non-async

Fix unit tests, all passing now