diff --git a/test/test-project/test/TestObjectHoleInScenarioNos.Codeunit.al b/test/test-project/test/TestObjectHoleInScenarioNos.Codeunit.al
new file mode 100644
index 0000000..98462a7
--- /dev/null
+++ b/test/test-project/test/TestObjectHoleInScenarioNos.Codeunit.al
@@ -0,0 +1,45 @@
+codeunit 50109 "TestObjectHoleInScenarioNosFLX"
+{
+    Subtype = Test;
+
+    var
+        IsInitialized: Boolean;
+
+    trigger OnRun()
+    begin
+        // [FEATURE] Feature
+    end;
+
+    [Test]
+    procedure TestFunctionForScenario1()
+    // [FEATURE] Feature
+    begin
+        // [SCENARIO 0001] Test function for scenario 1
+        Initialize();
+    end;
+
+    [Test]
+    procedure TestFunctionorScenario3()
+    // [FEATURE] Feature
+    begin
+        // [SCENARIO 0003] Test function for scenario 3
+        Initialize();
+    end;
+
+    local procedure Initialize()
+    var
+        LibraryTestInitialize: Codeunit "Library - Test Initialize";
+    begin
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectHoleInScenarioNosFLX");
+
+        if IsInitialized then
+            exit;
+
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectHoleInScenarioNosFLX");
+
+        IsInitialized := true;
+        Commit();
+
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectHoleInScenarioNosFLX");
+    end;
+}
\ No newline at end of file
diff --git a/test/test-project/test/TestObjectWithInitialize.Codeunit.al b/test/test-project/test/TestObjectWithInitialize.Codeunit.al
index 5eb9bc8..a17d3e7 100644
--- a/test/test-project/test/TestObjectWithInitialize.Codeunit.al
+++ b/test/test-project/test/TestObjectWithInitialize.Codeunit.al
@@ -25,17 +25,17 @@ codeunit 50103 "TestObjectWithInitializeFLX"
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     local procedure CreateValidGiven()
diff --git a/test/test-project/test/TestObjectWithUIHandler.Codeunit.al b/test/test-project/test/TestObjectWithUIHandler.Codeunit.al
index 8c294ef..b967bba 100644
--- a/test/test-project/test/TestObjectWithUIHandler.Codeunit.al
+++ b/test/test-project/test/TestObjectWithUIHandler.Codeunit.al
@@ -26,17 +26,17 @@ codeunit 50104 "TestObjectWithUIHandlerFLX"
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     local procedure CreateValidGiven()
diff --git a/test/test-scenarios/atdd-test-scenarios-and-results.xlsx b/test/test-scenarios/atdd-test-scenarios-and-results.xlsx
index a4a3dec..783ea79 100644
Binary files a/test/test-scenarios/atdd-test-scenarios-and-results.xlsx and b/test/test-scenarios/atdd-test-scenarios-and-results.xlsx differ
diff --git a/vscode-extension/src/App logic/Utils/config.ts b/vscode-extension/src/App logic/Utils/config.ts
index 0d502f0..27289e9 100644
--- a/vscode-extension/src/App logic/Utils/config.ts	
+++ b/vscode-extension/src/App logic/Utils/config.ts	
@@ -43,7 +43,7 @@ export class Config {
         return this.getConfig().get<boolean>('showConfirmations', true);
     }
     static setShowConfirmations(newValue: boolean) {
-        this.getConfig().update('showConfirmations', newValue, ConfigurationTarget.Workspace);
+        this.getConfig().update('showConfirmations', newValue, ConfigurationTarget.Global);
     }
     private static getConfig(uri?: Uri): WorkspaceConfiguration {
         return workspace.getConfiguration(this.app, uri);
diff --git a/vscode-extension/src/test/atddTestScenariosAndResults_Add.test.ts b/vscode-extension/src/test/atddTestScenariosAndResults_Add.test.ts
index 7b7819e..46a36ea 100644
--- a/vscode-extension/src/test/atddTestScenariosAndResults_Add.test.ts
+++ b/vscode-extension/src/test/atddTestScenariosAndResults_Add.test.ts
@@ -11,9 +11,9 @@ suite('Add', function () {
 		await TestHelper.resetConfigurations();
 	});
 	
-	test('Scenario001', async () => {
+	test('Scenario 001 - Add New Given', async () => {
 		//Given Test function with valid Given-When-Then structure
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Add Given "New Given"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
@@ -28,9 +28,9 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario001.al');
 	})
-	test('Scenario002', async () => {
+	test('Scenario 002 - Add New Given 2', async () => {
 		//Given Result from scenario 1
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Add Given "New Given 2"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
@@ -45,10 +45,10 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario002.al');
 	})
-	test('Scenario003', async () => {
+	test('Scenario 003 - Add duplicate Given', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Add Given "Valid Given"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
@@ -63,11 +63,11 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario003.al');
 	})
-	test('Scenario010', async () => {
+	test('Scenario 010 - Add New Given with non-alphabetic or non-numerical characters', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles()
 
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Add Given "New Given !@#$%^&*()"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
@@ -82,11 +82,11 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario010.al');
 	})
-	test('Scenario012', async () => {
+	test('Scenario 012 - Add New Given with only lowercase characters', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles()
 
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Add Given "new given all lowercase"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
@@ -101,11 +101,11 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario012.al');
 	})
-	test('Scenario014', async () => {
+	test('Scenario 014 - Given prefix', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles()
 
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.prefixGiven equals Make
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('prefixGiven', 'Make');
 
@@ -123,11 +123,11 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario014.al');
 	})
-	test('Scenario061', async () => {
+	test('Scenario 061 - Given helper function with no exception', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles()
 
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.addException equals false
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('addException', false);
 
@@ -145,11 +145,12 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario061.al');
 	})
-	test('Scenario004', async () => {
+
+	test('Scenario 004 - Add New Then', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles()
 
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Add Then "New Then"
 		let messageUpdate: MessageUpdate = {
@@ -165,9 +166,9 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario004.al');
 	})
-	test('Scenario005', async () => {
+	test('Scenario 005 - Add New Then 2', async () => {
 		//Given Result from scenario 4
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Add Then "New Then 2"
 		let messageUpdate: MessageUpdate = {
@@ -183,10 +184,10 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario005.al');
 	})
-	test('Scenario011', async () => {
+	test('Scenario 011 - Add New Then with non-alphabetic or non-numerical characters', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Add Then "New Then !@#$%^&*()"
 		let messageUpdate: MessageUpdate = {
@@ -202,10 +203,10 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario011.al');
 	})
-	test('Scenario013', async () => {
+	test('Scenario 013 - Add New Then with only lowercase characters', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Add Then "new then all lowercase"
 		let messageUpdate: MessageUpdate = {
@@ -221,10 +222,10 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario013.al');
 	})
-	test('Scenario015', async () => {
+	test('Scenario 015 - Then prefix', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.prefixThen equals Check
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('prefixThen', 'Check')
 
@@ -242,10 +243,10 @@ suite('Add', function () {
 		//Then
 		await TestHelper.verifyResult(messageUpdate, 'scenario015.al');
 	})
-	test('Scenario062', async () => {
+	test('Scenario 062 - Then helper function with no exception', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.addException equals false
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('addException', false)
 
diff --git a/vscode-extension/src/test/atddTestScenariosAndResults_AddFeature.test.ts b/vscode-extension/src/test/atddTestScenariosAndResults_AddFeature.test.ts
index a9d9f05..da9c45d 100644
--- a/vscode-extension/src/test/atddTestScenariosAndResults_AddFeature.test.ts
+++ b/vscode-extension/src/test/atddTestScenariosAndResults_AddFeature.test.ts
@@ -11,7 +11,7 @@ suite('AddFeature', function () {
 		await TestHelper.resetConfigurations();
 	});
 
-	test('Scenario086', async () => {
+	test('Scenario 086 - Add Feature 2a', async () => {
 		//Given Test Directory
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('testDirectory', 'src/codeunit')
 		//When User selects "Add Scenario" action
@@ -27,6 +27,6 @@ suite('AddFeature', function () {
 		}
 		//Then
 		await TestHelper.verifyChangeIsValid(messageUpdate);
-		await TestHelper.verifyResult(messageUpdate, 'scenario086.al');
+		await TestHelper.verifyResult(messageUpdate, 'scenario086.al', true);
 	})
 });
diff --git a/vscode-extension/src/test/atddTestScenariosAndResults_AddScenario.test.ts b/vscode-extension/src/test/atddTestScenariosAndResults_AddScenario.test.ts
index 3d39631..fa2db8b 100644
--- a/vscode-extension/src/test/atddTestScenariosAndResults_AddScenario.test.ts
+++ b/vscode-extension/src/test/atddTestScenariosAndResults_AddScenario.test.ts
@@ -11,9 +11,9 @@ suite('AddScenario', function () {
 		await TestHelper.resetConfigurations();
 	});
 
-	test('Scenario055', async () => {
+	test('Scenario 055 - Add Scenario (to existing test codeunit with 1 feature)', async () => {
 		//Given Test function with valid Given-When-Then structure
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When User selects "Add Scenario" action
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -30,9 +30,9 @@ suite('AddScenario', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyResult(messageUpdate, 'scenario055.al');
 	})
-	test('Scenario073', async () => {
+	test('Scenario 073 - Add another Scenario (to existing test codeunit with 1 feature)', async () => {
 		//Given Result from scenario 55
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When User selects "Add Scenario" action
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -49,10 +49,10 @@ suite('AddScenario', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyResult(messageUpdate, 'scenario073.al');
 	})
-	test('Scenario078', async () => {
+	test('Scenario 078 - Add Scenario (to existing test codeunit with 1 feature) with Given-When-Then', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Added scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -87,9 +87,9 @@ suite('AddScenario', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyResult(messageUpdate, 'scenario078.al');
 	})
-	test('Scenario079', async () => {
+	test('Scenario 079 - Add another Scenario (to existing test codeunit with 1 feature) with Given-When-Then', async () => {
 		//Given Test function with valid Given-When-Then structure
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Added scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
diff --git a/vscode-extension/src/test/atddTestScenariosAndResults_Remove.test.ts b/vscode-extension/src/test/atddTestScenariosAndResults_Remove.test.ts
index b8f49a0..844d455 100644
--- a/vscode-extension/src/test/atddTestScenariosAndResults_Remove.test.ts
+++ b/vscode-extension/src/test/atddTestScenariosAndResults_Remove.test.ts
@@ -13,10 +13,10 @@ suite('Remove', function () {
 		await TestHelper.resetConfigurations();
 	});
 
-	test('Scenario030', async () => {
+	test('Scenario 030 - Remove Given step 3a', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Remove "Valid Given"
 		let messageUpdate: MessageUpdate = {
@@ -38,10 +38,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario030.al')
 	})
-	test('Scenario036', async () => {
+	test('Scenario 031 - Remove Given step 2b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Remove "Valid Given"
 		let messageUpdate: MessageUpdate = {
@@ -61,10 +61,10 @@ suite('Remove', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock);
 	})
-	test('Scenario032', async () => {
+	test('Scenario 032 - Remove Given step 3b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Remove "Valid Given"
 		let messageUpdate: MessageUpdate = {
@@ -86,10 +86,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario032.al')
 	})
-	test('Scenario038', async () => {
+	test('Scenario 038 - Remove Duplicate Given', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given Duplicate "Valid Given"
 		let messageUpdate1: MessageUpdate = {
@@ -123,10 +123,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario038.al')
 	})
-	test('Scenario040', async () => {
+	test('Scenario 040 - Remove Given with non-alphabetic or non-numerical characters 1a', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given "New Given !@#$%^&*()"
 		let messageUpdate1: MessageUpdate = {
@@ -161,10 +161,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario040.al')
 	})
-	test('Scenario041', async () => {
+	test('Scenario 041 - Remove Given with non-alphabetic or non-numerical characters 1b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given "New Given !@#$%^&*()"
 		let messageUpdate1: MessageUpdate = {
@@ -200,10 +200,10 @@ suite('Remove', function () {
 	})
 
 
-	test('Scenario035', async () => {
+	test('Scenario 035 - Remove Then step 3a', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Remove "Valid Then"
 		let messageUpdate: MessageUpdate = {
@@ -225,10 +225,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario035.al')
 	})
-	test('Scenario036', async () => {
+	test('Scenario 036 - Remove Then step 2b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Remove "Valid Then"
 		let messageUpdate: MessageUpdate = {
@@ -248,10 +248,10 @@ suite('Remove', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock)
 	})
-	test('Scenario037', async () => {
+	test('Scenario 037 - Remove Then step 3b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Remove "Valid Then"
 		let messageUpdate: MessageUpdate = {
@@ -273,10 +273,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario037.al')
 	})
-	test('Scenario039', async () => {
+	test('Scenario 039 - Remove Duplicate Then', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given Duplicate Given "Valid Then"
 		let messageUpdate1: MessageUpdate = {
@@ -310,10 +310,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario039.al')
 	})
-	test('Scenario042', async () => {
+	test('Scenario 042 - Remove Then with non-alphabetic or non-numerical characters 1a', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given "New Then !@#$%^&*()"
 		let messageUpdate1: MessageUpdate = {
@@ -348,10 +348,10 @@ suite('Remove', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario042.al')
 	})
-	test('Scenario043', async () => {
+	test('Scenario 043 - Remove Then with non-alphabetic or non-numerical characters 1b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given "New Then !@#$%^&*()"
 		let messageUpdate1: MessageUpdate = {
diff --git a/vscode-extension/src/test/atddTestScenariosAndResults_RemoveScenario.test.ts b/vscode-extension/src/test/atddTestScenariosAndResults_RemoveScenario.test.ts
index 03d014c..1f8f126 100644
--- a/vscode-extension/src/test/atddTestScenariosAndResults_RemoveScenario.test.ts
+++ b/vscode-extension/src/test/atddTestScenariosAndResults_RemoveScenario.test.ts
@@ -12,9 +12,9 @@ suite('Remove Scenario', function () {
 		await TestHelper.resetConfigurations();
 	});
 
-	test('Scenario058', async () => {
+	test('Scenario 058 - Remove Scenario step 3a', async () => {
 		//Given Test function with valid Given-When-Then structure
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Remove Scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -36,10 +36,10 @@ suite('Remove Scenario', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario058.al');
 	})
-	test('Scenario059', async () => {
+	test('Scenario 059 - Remove Scenario step 2b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Remove Scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -58,10 +58,10 @@ suite('Remove Scenario', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock)
 	})
-	test('Scenario060', async () => {
+	test('Scenario 060 - Remove Scenario step 3b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Remove Scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -83,10 +83,10 @@ suite('Remove Scenario', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario060.al');
 	})
-	test('Scenario068', async () => {
+	test('Scenario 068 - Remove Scenario with Initialize', async () => {
 		//Given Test codeunit with one test function with valid Given-When-Then structure and call to Initialize
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithInitializeFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithInitialize.Codeunit.al')
 		//When Remove Scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -109,10 +109,10 @@ suite('Remove Scenario', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario068.al');
 	})
-	test('Scenario069', async () => {
+	test('Scenario 069 - Remove Scenario with UI Handler', async () => {
 		//Given Test codeunit with one test function with valid Given-When-Then structure and UI Handler
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithUIHandlerFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithUIHandler.Codeunit.al')
 		//When Remove Scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -136,10 +136,10 @@ suite('Remove Scenario', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario069.al');
 	})
-	test('Scenario070', async () => {
+	test('Scenario 070 - Remove Scenario with UI Handler 2', async () => {
 		//Given Test codeunit with one test function with valid Given-When-Then structure and UI Handler
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithUIHandlerFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithUIHandler.Codeunit.al')
 		//When Remove Scenario
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -163,10 +163,10 @@ suite('Remove Scenario', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario070.al');
 	})
-	test('Scenario071', async () => {
+	test('Scenario 071 - Removal Mode "No confirmation, but removal"', async () => {
 		//Given Test codeunit with one test function with valid Given-When-Then structure and call to Initialize
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithInitializeFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithInitialize.Codeunit.al')
 		//Given Setting atddTestScriptor.removalMode equals "No confirmation, but removal"
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('removalMode', 'No confirmation, but removal');
 
@@ -190,10 +190,10 @@ suite('Remove Scenario', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario071.al');
 	})
-	test('Scenario072', async () => {
+	test('Scenario 072 - Removal Mode "No confirmation & no removal"', async () => {
 		//Given Test codeunit with one test function with valid Given-When-Then structure and call to Initialize
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithInitializeFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectWithInitialize.Codeunit.al')
 		//Given Setting atddTestScriptor.removalMode equals "No confirmation, but removal"
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('removalMode', 'No confirmation & no removal');
 
diff --git a/vscode-extension/src/test/atddTestScenariosAndResults_Update.test.ts b/vscode-extension/src/test/atddTestScenariosAndResults_Update.test.ts
index 1af2db4..4ca5337 100644
--- a/vscode-extension/src/test/atddTestScenariosAndResults_Update.test.ts
+++ b/vscode-extension/src/test/atddTestScenariosAndResults_Update.test.ts
@@ -14,10 +14,11 @@ suite('Update', function () {
 		await TestHelper.resetConfigurations();
 	});
 
-	test('Scenario016', async () => {
+	// Given
+	test('Scenario 016 - Rename "Valid Given" to "Renamed Valid Given"', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Rename "Valid Given" to "Renamed Valid Given"
 		let messageUpdate: MessageUpdate = {
@@ -38,9 +39,9 @@ suite('Update', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock)
 	})
-	test('Scenario017', async () => {
+	test('Scenario 017 - Rename "Valid Given" to "Renamed Valid Given" step 2a', async () => {
 		//Given Result from scenario 16
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When User confirms update
 		let messageUpdate: MessageUpdate = {
@@ -62,9 +63,9 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario017.al')
 	})
-	test('Scenario019', async () => {
+	test('Scenario 019 - Revert Rename of Given step 2', async () => {
 		//Given Result from scenario 16
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When User confirms update
 		let messageUpdate: MessageUpdate = {
@@ -86,10 +87,10 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario019.al')
 	})
-	test('Scenario044', async () => {
+	test('Scenario 044 - Rename with other prefix', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.prefixGiven equals Make
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('prefixGiven', 'Make');
 		//Given Setting atddTestScriptor.prefixGivenHistory contains Create
@@ -115,10 +116,10 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario044.al')
 	})
-	test('Scenario087', async () => {
+	test('Scenario 087 - Rename with other prefix 2', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.prefixGiven equals Make
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('prefixGiven', 'Make');
 		//Given Setting atddTestScriptor.prefixGivenHistory does not contain Create
@@ -144,10 +145,10 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario087.al')
 	})
-	test('Scenario051', async () => {
+	test('Scenario 051 - Rename duplicate Given', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given Duplicate "Valid Given"
 		let messageUpdate1: MessageUpdate = {
@@ -182,12 +183,15 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario051.al')
 	})
-	test('Scenario021', async () => {
+
+	//When
+	test('Scenario 021 - Rename "Valid When" to "Renamed Valid When" step 2a', async () => {
+		//Given Result from scenario 20
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
-		//When Renamed "Valid Given" to "Renamed Valid Given"
+		//When Renamed "Valid When" to "Renamed Valid When"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
 			Feature: 'First test object',
@@ -207,11 +211,11 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario021.al')
 	})
-	test('Scenario023', async () => {
+	test('Scenario 023 - Revert Rename of When step 2', async () => {
 		//Given Result from scenario 21
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
-		//When Renamed "Renamed Valid Given" to "Valid Given"
+		//When Renamed "Renamed Valid When" to "Valid When"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
 			Feature: 'First test object',
@@ -231,19 +235,19 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario023.al')
 	})
-	test('Scenario047', async () => {
+	test('Scenario 047 - Rename "Valid When" to "Renamed Valid When" step 2b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
-		//When Rename "Valid Given" to "Renamed Valid Given"
+		//When Rename "Valid When" to "Renamed Valid When"
 		let messageUpdate: MessageUpdate = {
 			Scenario: 'First test function with valid Given-When-Then structure',
 			Feature: 'First test object',
-			Type: TypeChanged.Given,
+			Type: TypeChanged.When,
 			State: MessageState.Modified,
-			OldValue: 'Valid Given',
-			NewValue: 'Renamed Valid Given',
+			OldValue: 'Valid When',
+			NewValue: 'Renamed Valid When',
 			ArrayIndex: 0,
 			FsPath: fsPath,
 			Project: 'Test Project' //name of project in app.json
@@ -256,10 +260,11 @@ suite('Update', function () {
 		await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock)
 	})
 
-	test('Scenario025', async () => {
+	// Then
+	test('Scenario 025 - Rename "Valid Then" to "Renamed Valid Then" step 2a', async () => {
 		//Given Test function with Valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Renamed "Valid Then" to "Renamed Valid Then"
 		let messageUpdate: MessageUpdate = {
@@ -281,9 +286,9 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario025.al')
 	})
-	test('Scenario027', async () => {
+	test('Scenario 027 - Revert Rename of Then step 2', async () => {
 		//Given Result from scenario 25
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Rename "Renamed Valid Then" to "Valid Then"
 		let messageUpdate: MessageUpdate = {
@@ -305,10 +310,10 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario027.al')
 	})
-	test('Scenario048', async () => {
+	test('Scenario 048 - Rename "Valid Then" to "Renamed Valid Then" step 2b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 
 		//When Rename "Valid Then" to "Renamed Valid Then"
 		let messageUpdate: MessageUpdate = {
@@ -329,10 +334,10 @@ suite('Update', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock)
 	})
-	test('Scenario049', async () => {
+	test('Scenario 049 - Rename with other prefix', async () => {
 		//Given Test function with Valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.prefixThen equals Check
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('prefixThen', 'Check');
 		//Given Setting atddTestScriptor.prefixThenHistory contains Verify
@@ -358,10 +363,10 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario049.al')
 	})
-	test('Scenario088', async () => {
+	test('Scenario 088 - Rename with other prefix', async () => {
 		//Given Test function with Valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Setting atddTestScriptor.prefixThen equals Check
 		await workspace.getConfiguration('atddTestScriptor', Uri.file(TestHelper.pathOfTestProject)).update('prefixThen', 'Check');
 		//Given Setting atddTestScriptor.prefixThenHistory does not contain Verify
@@ -387,10 +392,10 @@ suite('Update', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario088.al')
 	})
-	test('Scenario053', async () => {
+	test('Scenario 053 - Rename duplicate Then', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al');
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al');
 
 		//Given Duplicate "Valid Then"
 		let messageUpdate1: MessageUpdate = {
diff --git a/vscode-extension/src/test/atddTestScenariosAndResults_UpdateScenario.test.ts b/vscode-extension/src/test/atddTestScenariosAndResults_UpdateScenario.test.ts
index bcfd397..1f2e23c 100644
--- a/vscode-extension/src/test/atddTestScenariosAndResults_UpdateScenario.test.ts
+++ b/vscode-extension/src/test/atddTestScenariosAndResults_UpdateScenario.test.ts
@@ -4,7 +4,7 @@ import { MessageState, MessageUpdate, TypeChanged } from '../typings/types';
 import { TestHelper } from './testHelper';
 
 
-suite('UpdateScenario', function () {
+suite('Update Scenario', function () {
 	this.beforeAll(async function () {
 		await TestHelper.resetFiles();
 	})
@@ -12,9 +12,9 @@ suite('UpdateScenario', function () {
 		await TestHelper.resetConfigurations();
 	});
 
-	test('Scenario081', async () => {
+	test('Scenario 081 - Rename scenario step 2a', async () => {
 		//Given Test function with valid Given-When-Then structure
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Rename "First test function with valid Given-When-Then structure" to "Valid Given-When-Then structure"
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -35,10 +35,10 @@ suite('UpdateScenario', function () {
 		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
 			await TestHelper.verifyResult(messageUpdate, 'scenario081.al');
 	})
-	test('Scenario082', async () => {
+	test('Scenario 082 - Rename scenario step 2b', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//When Rename "First test function with valid Given-When-Then structure" to "Valid Given-When-Then structure"
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -57,10 +57,10 @@ suite('UpdateScenario', function () {
 		await TestHelper.verifyChangeIsValid(messageUpdate);
 		await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock)
 	})
-	test('Scenario083', async () => {
+	test('Scenario 083 - Rename to already existing scenario name', async () => {
 		//Given Test function with valid Given-When-Then structure
 		await TestHelper.resetFiles();
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		//Given Test function SecondTestFunctionWithValidGivenWhenThenStructurewith valid Given-When-Then structure
 		let messageUpdate: MessageUpdate = {
 			Scenario: '',
@@ -86,31 +86,4 @@ suite('UpdateScenario', function () {
 		//Then
 		await TestHelper.verifyChangeIsValid(messageUpdate, false);
 	})
-	test('Scenario084', async () => {
-		//Given Result from scenario 83
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
-
-		//When Change "Third test function with valid Given-When-Then structure" to "Another test function with valid Given-When-Then structure" to and confirm
-		let messageUpdate: MessageUpdate = {
-			Scenario: '',
-			Feature: 'First test object',
-			Type: TypeChanged.ScenarioName,
-			State: MessageState.Modified,
-			OldValue: 'Third test function with valid Given-When-Then structure',
-			NewValue: 'Another test function with valid Given-When-Then structure',
-			Id: 3,
-			FsPath: fsPath,
-			Project: 'Test Project' //name of project in app.json
-		}
-
-		//Then
-		let userInteractionMock = new UserInteractionMock();
-		let confirmUpdateOfScenarioQuestion: string = 'Do you want to update this scenario?';
-		userInteractionMock.configure(confirmUpdateOfScenarioQuestion, 'Yes')
-		await TestHelper.verifyChangeIsValid(messageUpdate);
-		if (await TestHelper.verifyUserQuestions(messageUpdate, userInteractionMock))
-			await TestHelper.verifyResult(messageUpdate, 'scenario084.al')
-	})
-
-});
-
+});
\ No newline at end of file
diff --git a/vscode-extension/src/test/orgs/DuplicateTestObjectFLX.Codeunit.al b/vscode-extension/src/test/orgs/DuplicateTestObject.Codeunit.al
similarity index 96%
rename from vscode-extension/src/test/orgs/DuplicateTestObjectFLX.Codeunit.al
rename to vscode-extension/src/test/orgs/DuplicateTestObject.Codeunit.al
index 1a3f986..1e9ad9f 100644
--- a/vscode-extension/src/test/orgs/DuplicateTestObjectFLX.Codeunit.al
+++ b/vscode-extension/src/test/orgs/DuplicateTestObject.Codeunit.al
@@ -1,4 +1,4 @@
-codeunit 50101 DuplicateTestObjectFLX
+codeunit 50101 "DuplicateTestObjectFLX"
 {
     Subtype = Test;
 
diff --git a/vscode-extension/src/test/orgs/TestObjectFLX.Codeunit.al b/vscode-extension/src/test/orgs/TestObject.Codeunit.al
similarity index 89%
rename from vscode-extension/src/test/orgs/TestObjectFLX.Codeunit.al
rename to vscode-extension/src/test/orgs/TestObject.Codeunit.al
index addaf06..a7fc56a 100644
--- a/vscode-extension/src/test/orgs/TestObjectFLX.Codeunit.al
+++ b/vscode-extension/src/test/orgs/TestObject.Codeunit.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/orgs/TestObjectWithInitializeFLX.Codeunit.al b/vscode-extension/src/test/orgs/TestObjectWithInitialize.Codeunit.al
similarity index 86%
rename from vscode-extension/src/test/orgs/TestObjectWithInitializeFLX.Codeunit.al
rename to vscode-extension/src/test/orgs/TestObjectWithInitialize.Codeunit.al
index 06cf2b4..a17d3e7 100644
--- a/vscode-extension/src/test/orgs/TestObjectWithInitializeFLX.Codeunit.al
+++ b/vscode-extension/src/test/orgs/TestObjectWithInitialize.Codeunit.al
@@ -1,4 +1,4 @@
-codeunit 50103 TestObjectWithInitializeFLX
+codeunit 50103 "TestObjectWithInitializeFLX"
 {
     Subtype = Test;
 
@@ -25,17 +25,17 @@ codeunit 50103 TestObjectWithInitializeFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     local procedure CreateValidGiven()
diff --git a/vscode-extension/src/test/orgs/TestObjectWithUIHandlerFLX.Codeunit.al b/vscode-extension/src/test/orgs/TestObjectWithUIHandler.Codeunit.al
similarity index 81%
rename from vscode-extension/src/test/orgs/TestObjectWithUIHandlerFLX.Codeunit.al
rename to vscode-extension/src/test/orgs/TestObjectWithUIHandler.Codeunit.al
index 1c1fb62..b967bba 100644
--- a/vscode-extension/src/test/orgs/TestObjectWithUIHandlerFLX.Codeunit.al
+++ b/vscode-extension/src/test/orgs/TestObjectWithUIHandler.Codeunit.al
@@ -1,16 +1,16 @@
-codeunit 50104 TestObjectWithUIHandlerFLX
+codeunit 50104 "TestObjectWithUIHandlerFLX"
 {
     Subtype = Test;
 
     trigger OnRun()
     begin
-        // [FEATURE] Test object with UI Hanldler
+        // [FEATURE] Test object with UI Handler
     end;
 
     [Test]
     [HandlerFunctions('AMessageHandler')]
     procedure FifthTestFunctionWithValidGivenWhenThenStructureAndUIHandler()
-    // [FEATURE] Test object with UI Hanldler
+    // [FEATURE] Test object with UI Handler
     begin
         // [SCENARIO 0005] Fifth test function with valid Given-When-Then structure and UI handler
         Initialize();
@@ -26,17 +26,17 @@ codeunit 50104 TestObjectWithUIHandlerFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     local procedure CreateValidGiven()
diff --git a/vscode-extension/src/test/orgs/UnnumberedTestObjectFLX.al b/vscode-extension/src/test/orgs/UnnumberedTestObject.Codeunit.al
similarity index 97%
rename from vscode-extension/src/test/orgs/UnnumberedTestObjectFLX.al
rename to vscode-extension/src/test/orgs/UnnumberedTestObject.Codeunit.al
index 97bcea4..801546f 100644
--- a/vscode-extension/src/test/orgs/UnnumberedTestObjectFLX.al
+++ b/vscode-extension/src/test/orgs/UnnumberedTestObject.Codeunit.al
@@ -1,4 +1,4 @@
-codeunit 50102 UnnumberedTestObjectFLX
+codeunit 50102 "UnnumberedTestObjectFLX"
 {
     Subtype = Test;
 
diff --git a/vscode-extension/src/test/results/scenario001.al b/vscode-extension/src/test/results/scenario001.al
index ba0c664..25e4996 100644
--- a/vscode-extension/src/test/results/scenario001.al
+++ b/vscode-extension/src/test/results/scenario001.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario002.al b/vscode-extension/src/test/results/scenario002.al
index b9a7d3c..0621b35 100644
--- a/vscode-extension/src/test/results/scenario002.al
+++ b/vscode-extension/src/test/results/scenario002.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario003.al b/vscode-extension/src/test/results/scenario003.al
index 41392bc..6b9a184 100644
--- a/vscode-extension/src/test/results/scenario003.al
+++ b/vscode-extension/src/test/results/scenario003.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario004.al b/vscode-extension/src/test/results/scenario004.al
index 3bc999d..f48619a 100644
--- a/vscode-extension/src/test/results/scenario004.al
+++ b/vscode-extension/src/test/results/scenario004.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario005.al b/vscode-extension/src/test/results/scenario005.al
index 24c9c09..fe8f6b1 100644
--- a/vscode-extension/src/test/results/scenario005.al
+++ b/vscode-extension/src/test/results/scenario005.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario006.al b/vscode-extension/src/test/results/scenario006.al
index ccd2373..70664df 100644
--- a/vscode-extension/src/test/results/scenario006.al
+++ b/vscode-extension/src/test/results/scenario006.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario010.al b/vscode-extension/src/test/results/scenario010.al
index 657727c..e5d9940 100644
--- a/vscode-extension/src/test/results/scenario010.al
+++ b/vscode-extension/src/test/results/scenario010.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario011.al b/vscode-extension/src/test/results/scenario011.al
index f0f18b5..bad0dc4 100644
--- a/vscode-extension/src/test/results/scenario011.al
+++ b/vscode-extension/src/test/results/scenario011.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario012.al b/vscode-extension/src/test/results/scenario012.al
index 8d18cb2..21d7c8e 100644
--- a/vscode-extension/src/test/results/scenario012.al
+++ b/vscode-extension/src/test/results/scenario012.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario013.al b/vscode-extension/src/test/results/scenario013.al
index 917f5bd..bd8cc68 100644
--- a/vscode-extension/src/test/results/scenario013.al
+++ b/vscode-extension/src/test/results/scenario013.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario014.al b/vscode-extension/src/test/results/scenario014.al
index 794d089..47ec1ec 100644
--- a/vscode-extension/src/test/results/scenario014.al
+++ b/vscode-extension/src/test/results/scenario014.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario015.al b/vscode-extension/src/test/results/scenario015.al
index d2b1bfd..80c201a 100644
--- a/vscode-extension/src/test/results/scenario015.al
+++ b/vscode-extension/src/test/results/scenario015.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario017.al b/vscode-extension/src/test/results/scenario017.al
index 51d473f..d785d33 100644
--- a/vscode-extension/src/test/results/scenario017.al
+++ b/vscode-extension/src/test/results/scenario017.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario019.al b/vscode-extension/src/test/results/scenario019.al
index 7c04df6..588182c 100644
--- a/vscode-extension/src/test/results/scenario019.al
+++ b/vscode-extension/src/test/results/scenario019.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario021.al b/vscode-extension/src/test/results/scenario021.al
index 3840c1e..2eaf23b 100644
--- a/vscode-extension/src/test/results/scenario021.al
+++ b/vscode-extension/src/test/results/scenario021.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario023.al b/vscode-extension/src/test/results/scenario023.al
index ea48b31..792f6fe 100644
--- a/vscode-extension/src/test/results/scenario023.al
+++ b/vscode-extension/src/test/results/scenario023.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario025.al b/vscode-extension/src/test/results/scenario025.al
index bbc003d..57ab70e 100644
--- a/vscode-extension/src/test/results/scenario025.al
+++ b/vscode-extension/src/test/results/scenario025.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario027.al b/vscode-extension/src/test/results/scenario027.al
index 28b8272..b71e2d5 100644
--- a/vscode-extension/src/test/results/scenario027.al
+++ b/vscode-extension/src/test/results/scenario027.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario030.al b/vscode-extension/src/test/results/scenario030.al
index 3dd0412..badbbfe 100644
--- a/vscode-extension/src/test/results/scenario030.al
+++ b/vscode-extension/src/test/results/scenario030.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario032.al b/vscode-extension/src/test/results/scenario032.al
index 1f5d048..e09ed1d 100644
--- a/vscode-extension/src/test/results/scenario032.al
+++ b/vscode-extension/src/test/results/scenario032.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario035.al b/vscode-extension/src/test/results/scenario035.al
index 47f70ed..5d66348 100644
--- a/vscode-extension/src/test/results/scenario035.al
+++ b/vscode-extension/src/test/results/scenario035.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario037.al b/vscode-extension/src/test/results/scenario037.al
index e9f627b..769a6ea 100644
--- a/vscode-extension/src/test/results/scenario037.al
+++ b/vscode-extension/src/test/results/scenario037.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario038.al b/vscode-extension/src/test/results/scenario038.al
index addaf06..a7fc56a 100644
--- a/vscode-extension/src/test/results/scenario038.al
+++ b/vscode-extension/src/test/results/scenario038.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario039.al b/vscode-extension/src/test/results/scenario039.al
index addaf06..a7fc56a 100644
--- a/vscode-extension/src/test/results/scenario039.al
+++ b/vscode-extension/src/test/results/scenario039.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario040.al b/vscode-extension/src/test/results/scenario040.al
index addaf06..a7fc56a 100644
--- a/vscode-extension/src/test/results/scenario040.al
+++ b/vscode-extension/src/test/results/scenario040.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario041.al b/vscode-extension/src/test/results/scenario041.al
index 657727c..e5d9940 100644
--- a/vscode-extension/src/test/results/scenario041.al
+++ b/vscode-extension/src/test/results/scenario041.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario042.al b/vscode-extension/src/test/results/scenario042.al
index addaf06..a7fc56a 100644
--- a/vscode-extension/src/test/results/scenario042.al
+++ b/vscode-extension/src/test/results/scenario042.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario044.al b/vscode-extension/src/test/results/scenario044.al
index bd728a8..492c9e4 100644
--- a/vscode-extension/src/test/results/scenario044.al
+++ b/vscode-extension/src/test/results/scenario044.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario049.al b/vscode-extension/src/test/results/scenario049.al
index b9475dc..df037a7 100644
--- a/vscode-extension/src/test/results/scenario049.al
+++ b/vscode-extension/src/test/results/scenario049.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario051.al b/vscode-extension/src/test/results/scenario051.al
index 35f299e..48745b8 100644
--- a/vscode-extension/src/test/results/scenario051.al
+++ b/vscode-extension/src/test/results/scenario051.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario053.al b/vscode-extension/src/test/results/scenario053.al
index 7224427..7a95ccc 100644
--- a/vscode-extension/src/test/results/scenario053.al
+++ b/vscode-extension/src/test/results/scenario053.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario055.al b/vscode-extension/src/test/results/scenario055.al
index 8fc3b4b..a5ca22d 100644
--- a/vscode-extension/src/test/results/scenario055.al
+++ b/vscode-extension/src/test/results/scenario055.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -11,7 +11,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
@@ -49,16 +49,16 @@ codeunit 50100 TestObjectFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectFLX");
     end;
 }
\ No newline at end of file
diff --git a/vscode-extension/src/test/results/scenario058.al b/vscode-extension/src/test/results/scenario058.al
index c1422ec..cde23fa 100644
--- a/vscode-extension/src/test/results/scenario058.al
+++ b/vscode-extension/src/test/results/scenario058.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
diff --git a/vscode-extension/src/test/results/scenario060.al b/vscode-extension/src/test/results/scenario060.al
index 14dfb74..02d5705 100644
--- a/vscode-extension/src/test/results/scenario060.al
+++ b/vscode-extension/src/test/results/scenario060.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
diff --git a/vscode-extension/src/test/results/scenario061.al b/vscode-extension/src/test/results/scenario061.al
index 27bcc06..fa06791 100644
--- a/vscode-extension/src/test/results/scenario061.al
+++ b/vscode-extension/src/test/results/scenario061.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario062.al b/vscode-extension/src/test/results/scenario062.al
index 68b6dc7..496ac3a 100644
--- a/vscode-extension/src/test/results/scenario062.al
+++ b/vscode-extension/src/test/results/scenario062.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario068.al b/vscode-extension/src/test/results/scenario068.al
index 4b1cba3..04f7c1c 100644
--- a/vscode-extension/src/test/results/scenario068.al
+++ b/vscode-extension/src/test/results/scenario068.al
@@ -1,4 +1,4 @@
-codeunit 50103 TestObjectWithInitializeFLX
+codeunit 50103 "TestObjectWithInitializeFLX"
 {
     Subtype = Test;
 
@@ -11,17 +11,17 @@ codeunit 50103 TestObjectWithInitializeFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     var
diff --git a/vscode-extension/src/test/results/scenario069.al b/vscode-extension/src/test/results/scenario069.al
index 6029a5e..0727bc3 100644
--- a/vscode-extension/src/test/results/scenario069.al
+++ b/vscode-extension/src/test/results/scenario069.al
@@ -1,27 +1,27 @@
-codeunit 50104 TestObjectWithUIHandlerFLX
+codeunit 50104 "TestObjectWithUIHandlerFLX"
 {
     Subtype = Test;
 
     trigger OnRun()
     begin
-        // [FEATURE] Test object with UI Hanldler
+        // [FEATURE] Test object with UI Handler
     end;
 
     local procedure Initialize()
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     var
diff --git a/vscode-extension/src/test/results/scenario070.al b/vscode-extension/src/test/results/scenario070.al
index 7b0ffd6..efd2bcd 100644
--- a/vscode-extension/src/test/results/scenario070.al
+++ b/vscode-extension/src/test/results/scenario070.al
@@ -1,27 +1,27 @@
-codeunit 50104 TestObjectWithUIHandlerFLX
+codeunit 50104 "TestObjectWithUIHandlerFLX"
 {
     Subtype = Test;
 
     trigger OnRun()
     begin
-        // [FEATURE] Test object with UI Hanldler
+        // [FEATURE] Test object with UI Handler
     end;
 
     local procedure Initialize()
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     [MessageHandler]
diff --git a/vscode-extension/src/test/results/scenario071.al b/vscode-extension/src/test/results/scenario071.al
index 4b1cba3..04f7c1c 100644
--- a/vscode-extension/src/test/results/scenario071.al
+++ b/vscode-extension/src/test/results/scenario071.al
@@ -1,4 +1,4 @@
-codeunit 50103 TestObjectWithInitializeFLX
+codeunit 50103 "TestObjectWithInitializeFLX"
 {
     Subtype = Test;
 
@@ -11,17 +11,17 @@ codeunit 50103 TestObjectWithInitializeFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     var
diff --git a/vscode-extension/src/test/results/scenario072.al b/vscode-extension/src/test/results/scenario072.al
index 7ebf232..475a7e0 100644
--- a/vscode-extension/src/test/results/scenario072.al
+++ b/vscode-extension/src/test/results/scenario072.al
@@ -1,4 +1,4 @@
-codeunit 50103 TestObjectWithInitializeFLX
+codeunit 50103 "TestObjectWithInitializeFLX"
 {
     Subtype = Test;
 
@@ -11,17 +11,17 @@ codeunit 50103 TestObjectWithInitializeFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectWithInitializeFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectWithInitializeFLX");
     end;
 
     local procedure CreateValidGiven()
diff --git a/vscode-extension/src/test/results/scenario073.al b/vscode-extension/src/test/results/scenario073.al
index 4174ca6..022ada6 100644
--- a/vscode-extension/src/test/results/scenario073.al
+++ b/vscode-extension/src/test/results/scenario073.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -11,7 +11,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
@@ -56,16 +56,16 @@ codeunit 50100 TestObjectFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectFLX");
     end;
 }
\ No newline at end of file
diff --git a/vscode-extension/src/test/results/scenario078.al b/vscode-extension/src/test/results/scenario078.al
index ea16b3e..3c98c81 100644
--- a/vscode-extension/src/test/results/scenario078.al
+++ b/vscode-extension/src/test/results/scenario078.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -11,7 +11,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
@@ -55,17 +55,17 @@ codeunit 50100 TestObjectFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectFLX");
     end;
 
     local procedure CreateNewGiven()
diff --git a/vscode-extension/src/test/results/scenario079.al b/vscode-extension/src/test/results/scenario079.al
index 6a1b65e..6dc569d 100644
--- a/vscode-extension/src/test/results/scenario079.al
+++ b/vscode-extension/src/test/results/scenario079.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -11,7 +11,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
@@ -68,17 +68,17 @@ codeunit 50100 TestObjectFLX
     var
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
     begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnTestInitialize(Codeunit::"TestObjectFLX");
 
         if IsInitialized then
             exit;
 
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"TestObjectFLX");
 
         IsInitialized := true;
         Commit();
 
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectFLX);
+        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::"TestObjectFLX");
     end;
 
     local procedure CreateNewGiven()
diff --git a/vscode-extension/src/test/results/scenario081.al b/vscode-extension/src/test/results/scenario081.al
index d5405d4..7886ae0 100644
--- a/vscode-extension/src/test/results/scenario081.al
+++ b/vscode-extension/src/test/results/scenario081.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
diff --git a/vscode-extension/src/test/results/scenario084.al b/vscode-extension/src/test/results/scenario084.al
deleted file mode 100644
index 8ebf16e..0000000
--- a/vscode-extension/src/test/results/scenario084.al
+++ /dev/null
@@ -1,71 +0,0 @@
-codeunit 50100 TestObjectFLX
-{
-    Subtype = Test;
-
-    var
-        IsInitialized: Boolean;
-
-    trigger OnRun()
-    begin
-        // [FEATURE] First test object
-    end;
-
-    [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
-    // [FEATURE] First test object
-    begin
-        // [SCENARIO 0001] First test function with valid Given-When-Then structure
-        // [GIVEN] Valid Given
-        CreateValidGiven();
-        // [WHEN] Valid When
-        ValidWhen();
-        // [THEN] Valid Then
-        VerifyValidThen();
-    end;
-
-    [Test]
-    procedure SecondTestFunctionWithValidGivenWhenThenStructure()
-    begin
-        // [Scenario #0002] Second test function with valid Given-When-Then structure
-        Initialize();
-    end;
-
-    [Test]
-    procedure AnotherTestFunctionWithValidGivenWhenThenStructure()
-    begin
-        // [Scenario #0003] Another test function with valid Given-When-Then structure
-        Initialize();
-    end;
-
-    local procedure CreateValidGiven()
-    begin
-        Error('Procedure CreateValidGiven not yet implemented.');
-    end;
-
-    local procedure ValidWhen()
-    begin
-        Error('Procedure ValidWhen not yet implemented.');
-    end;
-
-    local procedure VerifyValidThen()
-    begin
-        Error('Procedure VerifyValidThen not yet implemented.');
-    end;
-
-    local procedure Initialize()
-    var
-        LibraryTestInitialize: Codeunit "Library - Test Initialize";
-    begin
-        LibraryTestInitialize.OnTestInitialize(Codeunit::TestObjectFLX);
-
-        if IsInitialized then
-            exit;
-
-        LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::TestObjectFLX);
-
-        IsInitialized := true;
-        Commit();
-
-        LibraryTestInitialize.OnAfterTestSuiteInitialize(Codeunit::TestObjectFLX);
-    end;
-}
\ No newline at end of file
diff --git a/vscode-extension/src/test/results/scenario087.al b/vscode-extension/src/test/results/scenario087.al
index 1acfa60..3a1df9d 100644
--- a/vscode-extension/src/test/results/scenario087.al
+++ b/vscode-extension/src/test/results/scenario087.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/results/scenario088.al b/vscode-extension/src/test/results/scenario088.al
index d56d547..0b011da 100644
--- a/vscode-extension/src/test/results/scenario088.al
+++ b/vscode-extension/src/test/results/scenario088.al
@@ -1,4 +1,4 @@
-codeunit 50100 TestObjectFLX
+codeunit 50100 "TestObjectFLX"
 {
     Subtype = Test;
 
@@ -8,7 +8,7 @@ codeunit 50100 TestObjectFLX
     end;
 
     [Test]
-    procedure FirstTestFunctionWithValidGivenWhenThenstructure()
+    procedure FirstTestFunctionWithValidGivenWhenThenStructure()
     // [FEATURE] First test object
     begin
         // [SCENARIO 0001] First test function with valid Given-When-Then structure
diff --git a/vscode-extension/src/test/testHelper.ts b/vscode-extension/src/test/testHelper.ts
index d836e44..20c1a8c 100644
--- a/vscode-extension/src/test/testHelper.ts
+++ b/vscode-extension/src/test/testHelper.ts
@@ -31,7 +31,7 @@ export class TestHelper {
 		assert.strictEqual(userInteractionMock.validate(), true, 'configured questions should match with the questions which popped up')
 		return result.wantsToContinue;
 	}
-	public static async verifyResult(messageUpdate: MessageUpdate, resultFsPath: string) {
+	public static async verifyResult(messageUpdate: MessageUpdate, resultFsPath: string, skipObjectTypeAndIdVerification: boolean = false) {
 		//Then save changes is valid
 		let successful: boolean = await new ObjectService().saveChanges(messageUpdate);
 		assert.strictEqual(successful, true, 'saveChanges() should run successfully.');
@@ -39,6 +39,10 @@ export class TestHelper {
 		let resultFilename: string = TestHelper.getFsPathOfResults(resultFsPath);
 		let expectedResult: string = readFileSync(resultFilename, { encoding: 'utf8' });
 		let actualResult: string = readFileSync(messageUpdate.FsPath, { encoding: 'utf8' });
+		if(skipObjectTypeAndIdVerification){
+			expectedResult = expectedResult.substring(expectedResult.match(/^\w+ \d+/)![0].length);
+			actualResult = actualResult.substring(actualResult.match(/^\w+ \d+/)![0].length);
+		}
 		assert.strictEqual(actualResult, expectedResult, 'fileContent should be identical.');
 	}
 	public static async resetConfigurations(): Promise<void> {
@@ -57,7 +61,7 @@ export class TestHelper {
 		await config.update('testDirectory', 'src')
 	}
 	public static getFsPathOfTestProject(filename: string): string {
-		return join(TestHelper.pathOfTestProject, 'src', 'codeunit', filename);
+		return join(TestHelper.pathOfTestProject, 'test', filename);
 	}
 	public static getFsPathOfResults(filename: string): string {
 		return join(TestHelper.pathOfTestResults, filename)
@@ -66,7 +70,7 @@ export class TestHelper {
 
 	public static async resetFiles(): Promise<void> {
 		let orgsFolder: string = join(__dirname, '..', '..', 'src', 'test', 'orgs')
-		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObjectFLX.Codeunit.al')
+		let fsPath: string = TestHelper.getFsPathOfTestProject('TestObject.Codeunit.al')
 		let pathParts: string[] = fsPath.split(/[/\\]/)
 		pathParts.pop();
 		let actualFolder: string = pathParts.join('\\')