Improve wording of cucumber scenarios