Cucumber tests - final commit