[PDI-12211] - Fix BaseStepTest compile errors in 5.1