Marc: [module 1.0.x] switch from deprecated MustMatchers to should