Cucumber tests green

Make all cucumber tests green