diff --git a/sapp/sarif_types.py b/sapp/sarif_types.py
index b161e36c..218ff489 100644
--- a/sapp/sarif_types.py
+++ b/sapp/sarif_types.py
@@ -7,8 +7,12 @@
 
 import sys
 from enum import Enum
-from typing import Dict, List, Optional, TypedDict, Union
+from typing import Dict, List, Optional, Union
 
+if sys.version_info >= (3, 8):
+    from typing import TypedDict
+else:
+    from typing_extensions import TypedDict
 
 if sys.version_info >= (3, 10):
     from typing import TypeAlias
diff --git a/sapp/tests/fake_object_generator.py b/sapp/tests/fake_object_generator.py
index b136bd58..535be331 100644
--- a/sapp/tests/fake_object_generator.py
+++ b/sapp/tests/fake_object_generator.py
@@ -9,9 +9,8 @@
 import datetime
 from typing import Callable, Optional
 
-from tools.sapp.sapp.models import RunStatus
-
 from ..bulk_saver import BulkSaver
+
 from ..models import (
     ClassTypeInterval,
     DBID,
@@ -23,6 +22,7 @@
     MetaRun,
     PurgeStatusForInstance,
     Run,
+    RunStatus,
     SharedText,
     SharedTextKind,
     SourceLocation,