Refactor two Cucumber steps into one more accurately described one

- Paired with @rgarner.