Fixed some problems with the cucumber tests