[#1814] Mark - Refactoring cucumber tests:

- Replacing calls to steps from other steps with calls to helper classes.