Merge #10371: [tests] Clean up addrman_tests.cpp