Simplify and clarify cucumber features

[Finishes #47068939]