fix remaining cucumber tests