Fixing cucumber tests - Saveen