Fix type for Core XYZ test code