Fix original cucumber steps