StepSelector toCasper and unit tests improved