Replacing validators with matchers