Fixes API - use Matcher<String> instead of Pattern