Allow only one matching step per label
Extend matching test protocols