fluent matchers: fixed descriptions, test clean-up