Some minor changes to cucumber tests