Merge "Fix test18566 to have the correct expectation"