Fixing 2 broken cucumber tests