Fix more cucumber tests