diff --git a/packages/generator-langium/templates/gitignore.txt b/packages/generator-langium/templates/gitignore.txt
index 32c0c06f5..06e1951c0 100644
--- a/packages/generator-langium/templates/gitignore.txt
+++ b/packages/generator-langium/templates/gitignore.txt
@@ -3,6 +3,8 @@
 !.vscode/launch.json
 !.vscode/tasks.json
 node_modules/
+dist/
 out/
-src/generated/
+**/src/generated
 syntaxes/
+*.tsbuildinfo
diff --git a/packages/generator-langium/templates/packages/language/test/linking.test.ts b/packages/generator-langium/templates/packages/language/test/linking.test.ts
index 89f12495a..a6f09f6ca 100644
--- a/packages/generator-langium/templates/packages/language/test/linking.test.ts
+++ b/packages/generator-langium/templates/packages/language/test/linking.test.ts
@@ -2,7 +2,8 @@ import { afterEach, beforeAll, describe, expect, test } from "vitest";
 import { EmptyFileSystem, type LangiumDocument } from "langium";
 import { expandToString as s } from "langium/generate";
 import { clearDocuments, parseHelper } from "langium/test";
-import { create<%= LanguageName %>Services, isModel, Model } from "<%= language-id %>-language";
+import type { Model } from "<%= language-id %>-language";
+import { create<%= LanguageName %>Services, isModel } from "<%= language-id %>-language";
 
 let services: ReturnType<typeof create<%= LanguageName %>Services>;
 let parse:    ReturnType<typeof parseHelper<Model>>;
@@ -47,6 +48,6 @@ function checkDocumentValid(document: LangiumDocument): string | undefined {
           ${document.parseResult.parserErrors.map(e => e.message).join('\n  ')}
     `
         || document.parseResult.value === undefined && `ParseResult is 'undefined'.`
-        || !isModel(document.parseResult.value) && `Root AST object is a ${document.parseResult.value.$type}, expected a '${Model}'.`
+        || !isModel(document.parseResult.value) && `Root AST object is a ${document.parseResult.value.$type}, expected a 'Model'.`
         || undefined;
 }
diff --git a/packages/generator-langium/templates/packages/language/test/parsing.test.ts b/packages/generator-langium/templates/packages/language/test/parsing.test.ts
index 0d6e54354..f9b5fa44b 100644
--- a/packages/generator-langium/templates/packages/language/test/parsing.test.ts
+++ b/packages/generator-langium/templates/packages/language/test/parsing.test.ts
@@ -55,6 +55,6 @@ function checkDocumentValid(document: LangiumDocument): string | undefined {
           ${document.parseResult.parserErrors.map(e => e.message).join('\n  ')}
     `
         || document.parseResult.value === undefined && `ParseResult is 'undefined'.`
-        || !isModel(document.parseResult.value) && `Root AST object is a ${document.parseResult.value.$type}, expected a Model'.`
+        || !isModel(document.parseResult.value) && `Root AST object is a ${document.parseResult.value.$type}, expected a 'Model'.`
         || undefined;
 }