Make feature scenarios more generic