Updated cucumber tests