Updated some cucumber steps