fluent matchers: fixed new adapter architecture