Merge "Fix fixed_ips tests to skip if ip not found"