Fixing old cucumber tests - Saveen