Fixing cucumber tests after UI enhancments