re-factor cucumber tests and add new ones
Merge branch 'origin/support/refactor-cucumber-tests'