adjusted cucumber tests
merged