Fix more cucumber failure due to `-f`