Merge "Fix phone_lookup related tests"