Add unit and cucumber tests