First draft cucumber tests complete