[Sophie] Adding some more waits into the cucumber tests