Moving custom matchers to separate classes