Improve testing story with new matcher and DI
Extract error messages in AST transform.