Fix up tests for ResolveAddr