[#Fixing Tests] Fixing cucumber tests