diff --git a/src/components/App.test.tsx b/src/components/App.test.tsx
index 66aacac..aa769f7 100755
--- a/src/components/App.test.tsx
+++ b/src/components/App.test.tsx
@@ -1,9 +1,8 @@
 import React from "react";
 import { render, screen } from "@testing-library/react";
 import { App } from "./App";
-import { AppConfigContext } from "../app-config-context";
-import { AppConfigModel } from "../models/app-config-model";
 import { mockAppConfig } from "../test-utils/mock-app-config";
+import { MockAppConfigProvider } from "../test-utils/app-config-provider";
 
 jest.mock("../hooks/use-assistant-store", () => ({
   useAssistantStore: jest.fn(() => ({
@@ -22,14 +21,6 @@ jest.mock("../models/app-config-model", () => ({
   }
 }));
 
-const MockAppConfigProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  const mockAppConfigValue = AppConfigModel.create(mockAppConfig);
-  return (
-    <AppConfigContext.Provider value={mockAppConfigValue}>
-      {children}
-    </AppConfigContext.Provider>
-  );
-};
 
 describe("test load app", () => {
   it("renders without crashing", () => {
diff --git a/src/components/developer-options.test.tsx b/src/components/developer-options.test.tsx
index 4f81285..bf73763 100644
--- a/src/components/developer-options.test.tsx
+++ b/src/components/developer-options.test.tsx
@@ -18,7 +18,7 @@ const mockTranscriptStore = ChatTranscriptModel.create({
   ],
 });
 
-const assistantStore = AssistantModel.create({
+const mockAssistantStore = AssistantModel.create({
   assistant: {},
   assistantId: "asst_abc123",
   instructions: "This is just a test",
@@ -44,7 +44,7 @@ describe("test developer options component", () => {
     return (
       <MockAppConfigProvider>
         <DeveloperOptionsComponent
-          assistantStore={assistantStore}
+          assistantStore={mockAssistantStore}
           onCreateThread={onCreateThread}
           onDeleteThread={onDeleteThread}
           onMockAssistant={onMockAssistant}
diff --git a/src/components/keyboard-shortcut-controls.test.tsx b/src/components/keyboard-shortcut-controls.test.tsx
index df553b4..50ce9ec 100644
--- a/src/components/keyboard-shortcut-controls.test.tsx
+++ b/src/components/keyboard-shortcut-controls.test.tsx
@@ -41,7 +41,7 @@ describe("test keyboard shortcut controls component", () => {
     expect(button).toHaveTextContent("Disable Shortcut");
   });
 
-  it.skip("renders a form for customizing the keyboard shortcut", async () => {
+  it("renders a form for customizing the keyboard shortcut", async () => {
     render(<WrapperComponent />);
     const form = screen.getByTestId("custom-keyboard-shortcut-form");
     const input = within(form).getByTestId("custom-keyboard-shortcut");
@@ -60,7 +60,7 @@ describe("test keyboard shortcut controls component", () => {
     expect(dismissButton).toHaveTextContent("dismiss");
   });
 
-  it.skip("shows an error message if the custom keyboard shortcut input is empty", () => {
+  it("shows an error message if the custom keyboard shortcut input is empty", () => {
     render(<WrapperComponent />);
     const form = screen.getByTestId("custom-keyboard-shortcut-form");
     const input = within(form).getByTestId("custom-keyboard-shortcut");