Refactor RSpec tests to require Cucumber helpers, factories (remove duplication); remove unused steps and helpers