Fix the failing Cucumber tests