Change existing tests to use validation matchers