Fixing cucumber tests
Finished fixing cucumber tests