Fixed broken cucumber tests