Merge "Fix test_allowed_address_pair test case cleanup"