Fixing cucumber tests
merge master changes