[SP-1388] - Fix BaseStepTest compile errors in 5.1