StepClick unit tests fix