Fix up feature step definitions