Fixed some failing cucumber features