rewrote wire and collection Cucumber steps to reduce code duplication