Merge dogfood tests in with resolve tests and group them by the AST type they are testing