Improve broker test coverage (~90%).