diff --git a/src/razor/src/document/razorDocumentSynchronizer.ts b/src/razor/src/document/razorDocumentSynchronizer.ts
index 34d6eaa600..8ec50dfca0 100644
--- a/src/razor/src/document/razorDocumentSynchronizer.ts
+++ b/src/razor/src/document/razorDocumentSynchronizer.ts
@@ -128,15 +128,26 @@ export class RazorDocumentSynchronizer {
         token: vscode.CancellationToken
     ) {
         const rejectionsForCancel: Array<(reason: string) => void> = [];
+        function isTokenCancellationRequestedError(err: unknown): boolean {
+            return typeof err === 'string' && err === 'Token cancellation requested: {0}';
+        }
         let projectedDocumentSynchronized: () => void = Function;
         const onProjectedDocumentSynchronized = new Promise<void>((resolve, reject) => {
             projectedDocumentSynchronized = resolve;
             rejectionsForCancel.push(reject);
+        }).catch((err) => {
+            if (!isTokenCancellationRequestedError(err)) {
+                throw err;
+            }
         });
         let projectedTextDocumentSynchronized: () => void = Function;
         const onProjectedTextDocumentSynchronized = new Promise<void>((resolve, reject) => {
             projectedTextDocumentSynchronized = resolve;
             rejectionsForCancel.push(reject);
+        }).catch((err) => {
+            if (!isTokenCancellationRequestedError(err)) {
+                throw err;
+            }
         });
 
         token.onCancellationRequested((reason) => {
diff --git a/test/razor/razorIntegrationTests/completion.integration.test.ts b/test/razor/razorIntegrationTests/completion.integration.test.ts
index 1c3e6eeacb..355b9373a3 100644
--- a/test/razor/razorIntegrationTests/completion.integration.test.ts
+++ b/test/razor/razorIntegrationTests/completion.integration.test.ts
@@ -44,6 +44,8 @@ integrationHelpers.describeIfDevKit(`Razor Hover ${testAssetWorkspace.descriptio
             vscode.CompletionItemKind.TypeParameter,
             'text'
         );
+
+        await clearLine(4);
     });
 
     test('Div Tag', async () => {
@@ -65,8 +67,112 @@ integrationHelpers.describeIfDevKit(`Razor Hover ${testAssetWorkspace.descriptio
             'div',
             expectedDocumentation
         );
+
+        await clearLine(6);
     }, 30000);
 
+    test('Disabled Attribute', async () => {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        await insertText(new vscode.Position(6, 0), '<button dis');
+
+        await waitForExpectedCompletionItemAsync(
+            new vscode.Position(6, 11),
+            undefined,
+            undefined,
+            'disabled',
+            vscode.CompletionItemKind.Value,
+            'disabled'
+        );
+
+        await clearLine(6);
+    }, 30000);
+
+    test('Dir Attribute', async () => {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        await insertText(new vscode.Position(6, 0), '<div dir=');
+
+        await waitForExpectedCompletionItemAsync(
+            new vscode.Position(6, 9),
+            undefined,
+            undefined,
+            'auto',
+            vscode.CompletionItemKind.Unit,
+            '"auto"'
+        );
+
+        await clearLine(6);
+    }, 30000);
+
+    test('C# String Type', async () => {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        await insertText(new vscode.Position(8, 0), 'str');
+
+        await waitForExpectedCompletionItemAsync(
+            new vscode.Position(8, 3),
+            undefined,
+            undefined,
+            'string',
+            vscode.CompletionItemKind.Keyword,
+            'string'
+        );
+
+        await clearLine(8);
+    }, 30000);
+
+    test('C# Override', async () => {
+        if (!integrationHelpers.isRazorWorkspace(vscode.workspace)) {
+            return;
+        }
+
+        await insertText(new vscode.Position(8, 0), 'override OnA');
+
+        await waitForExpectedCompletionItemAsync(
+            new vscode.Position(8, 12),
+            undefined,
+            undefined,
+            'OnAfterRender(bool firstRender)',
+            vscode.CompletionItemKind.Method,
+            // This is not correct - filed https://github.com/dotnet/vscode-csharp/issues/8310
+            'OnA'
+        );
+
+        await clearLine(8);
+    }, 30000);
+
+    async function insertText(position: vscode.Position, text: string): Promise<void> {
+        const activeEditor = vscode.window.activeTextEditor;
+        if (!activeEditor) {
+            throw new Error('No active editor');
+        }
+
+        await activeEditor.edit((builder) => {
+            builder.insert(position, text);
+        });
+    }
+
+    async function clearLine(lineNumber: number): Promise<void> {
+        const editor = vscode.window.activeTextEditor;
+        if (!editor) {
+            return;
+        }
+
+        const lineObj = editor.document.lineAt(lineNumber);
+        const textRange = new vscode.Range(lineObj.range.start, lineObj.range.end);
+
+        await editor.edit((editBuilder) => {
+            editBuilder.delete(textRange);
+        });
+    }
+
     async function getCompletionsAsync(
         position: vscode.Position,
         triggerCharacter: string | undefined,
@@ -117,7 +223,13 @@ integrationHelpers.describeIfDevKit(`Razor Hover ${testAssetWorkspace.descriptio
                 }
                 expect(completionItem).toBeDefined();
                 expect(completionItem!.kind).toEqual(expectedKind);
-                expect(completionItem!.insertText).toBe(expectedInsertText);
+
+                const insertText =
+                    completionItem.insertText instanceof vscode.SnippetString
+                        ? completionItem.insertText.value
+                        : completionItem.insertText;
+                expect(insertText).toBe(expectedInsertText);
+
                 if (expectedDocumentation) {
                     const documentation = completionItem!.documentation as vscode.MarkdownString;
                     expect(documentation.value).toBe(expectedDocumentation);