Refactor TestAddress