Fixed most of the cucumber tests. 2 expected failures