Merge "Fix test to avoid a fixed local port"