Updated cucumber tests, all passing