diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 5fddb1e91d9..119878ce8c5 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -48,11 +48,14 @@ jobs:
       - name: Download and Apply Patch
         run: ./apply-patch.sh "${{ github.event.pull_request.head.sha }}" "${{ github.sha }}" add-sentry-to-alamofire
 
-      - name: Install Firewalk
-        run: brew install alamofire/alamofire/firewalk
+      - name: Download Firewalk
+        run: curl "https://github.com/Alamofire/Firewalk/releases/download/0.8.1/firewalk.zip" --output firewalk.zip -L
+
+      - name: Unzip Firewalk
+        run: Unzip "firewalk.zip"
 
       - name: Start Firewalk
-        run: firewalk &
+        run: ./firewalk &
 
       - name: Validate Firewalk is running
         run: curl http://localhost:8080/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25711cf2f04..359f2380572 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,6 @@ This version adds a dependency on Swift.
     - Rename `SentryScope.add(_ crumb:)` to `SentryScope.addBreadcrumb(_ crumb:)` (#2416)
     - Rename `SentryScope.add(_ attachment:)` to `SentryScope.addAttachment(_ attachment:)` (#2416)
     - Rename `Client` to `SentryClient` (#2403)
-    - Rename `User` to `SentryUser` (#2403)
 - Remove public APIs
     - Remove `SentryScope.apply(to:)` (#2416)
     - Remove `SentryScope.apply(to:maxBreadcrumb:)` (#2416)
@@ -43,6 +42,13 @@ This version adds a dependency on Swift.
     - Rename `SentryOptions.enablePreWarmedAppStartTracking` to `enablePreWarmedAppStartTracing`
     - Rename `SentryOptions.enableFileIOTracking` to `enableFileIOTracing`
     - Rename `SentryOptions.enableCoreDataTracking` to `enableCoreDataTracing`
+    
+## 7.31.3
+
+### Fixes
+
+- Reporting crashes when restarting the SDK (#2440)
+- Core data span status with error (#2439)
 
 ## 7.31.2
 
diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
index 1e717cffe92..c1c94c626d4 100644
--- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
+++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
@@ -1111,7 +1111,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.2;
+				MARKETING_VERSION = 7.31.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
@@ -1140,7 +1140,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.2;
+				MARKETING_VERSION = 7.31.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
@@ -1785,7 +1785,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.2;
+				MARKETING_VERSION = 7.31.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
@@ -1820,7 +1820,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 7.31.2;
+				MARKETING_VERSION = 7.31.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";
diff --git a/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift b/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift
index 3d273396dc3..eb0d35b2004 100644
--- a/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift
+++ b/Samples/iOS-Swift/iOS-Swift/AppDelegate.swift
@@ -7,9 +7,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     static let defaultDSN = "https://6cc9bae94def43cab8444a99e0031c28@o447951.ingest.sentry.io/5428557"
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        
+    
+    static func startSentry() {
         // For testing purposes, we want to be able to change the DSN and store it to disk. In a real app, you shouldn't need this behavior.
         let dsn = DSNStorage.shared.getDSN() ?? AppDelegate.defaultDSN
         DSNStorage.shared.saveDSN(dsn: dsn)
@@ -45,6 +44,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             let httpStatusCodeRange = HttpStatusCodeRange(min: 400, max: 599)
             options.failedRequestStatusCodes = [ httpStatusCodeRange ]
         }
+    }
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        
+        AppDelegate.startSentry()
         
         if #available(iOS 14.0, *) {
             metricKit.receiveReports()
diff --git a/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard b/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
index 0ed14a09aba..029585c65a8 100644
--- a/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
+++ b/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="5CD-RQ-aBU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="5CD-RQ-aBU">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -18,13 +18,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleAspectFit" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="480-5y-FtF">
-                                <rect key="frame" x="8" y="222" width="398" height="506.5"/>
+                                <rect key="frame" x="8" y="199.5" width="398" height="555.5"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="top" translatesAutoresizingMaskIntoConstraints="NO" id="VbH-LD-DBn">
-                                        <rect key="frame" x="0.0" y="0.0" width="398" height="341"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="398" height="390"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="hHG-as-TfH">
-                                                <rect key="frame" x="0.0" y="0.0" width="181.5" height="330"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="181.5" height="390"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QJW-l9-sD6">
                                                         <rect key="frame" x="0.0" y="0.0" width="181.5" height="30"/>
@@ -105,34 +105,48 @@
                                                             <action selector="permissions:" destination="BYZ-38-t0r" eventType="touchUpInside" id="65U-z2-FjW"/>
                                                         </connections>
                                                     </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="689-IN-jTP">
+                                                        <rect key="frame" x="0.0" y="330" width="181.5" height="30"/>
+                                                        <state key="normal" title="Close"/>
+                                                        <connections>
+                                                            <action selector="close:" destination="BYZ-38-t0r" eventType="touchUpInside" id="P48-2Y-SKT"/>
+                                                        </connections>
+                                                    </button>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QIi-IM-YSk">
+                                                        <rect key="frame" x="0.0" y="360" width="181.5" height="30"/>
+                                                        <state key="normal" title="Start SDK"/>
+                                                        <connections>
+                                                            <action selector="startSDK:" destination="BYZ-38-t0r" eventType="touchUpInside" id="UoF-Pv-fKg"/>
+                                                        </connections>
+                                                    </button>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="1a2-Yg-Az9">
-                                                <rect key="frame" x="181.5" y="0.0" width="216.5" height="341"/>
+                                                <rect key="frame" x="181.5" y="0.0" width="216.5" height="379.5"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yi7-GN-26l">
-                                                        <rect key="frame" x="0.0" y="0.0" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="216.5" height="34.5"/>
                                                         <state key="normal" title="ANR fully blocking"/>
                                                         <connections>
                                                             <action selector="anrFullyBlocking:" destination="BYZ-38-t0r" eventType="touchUpInside" id="dJy-Fs-khK"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TSF-10-5ts">
-                                                        <rect key="frame" x="0.0" y="31" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="34.5" width="216.5" height="34.5"/>
                                                         <state key="normal" title="ANR filling run loop"/>
                                                         <connections>
                                                             <action selector="anrFillingRunLoop:" destination="BYZ-38-t0r" eventType="touchUpInside" id="13D-io-hVz"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cdR-H3-8fr">
-                                                        <rect key="frame" x="0.0" y="62" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="69" width="216.5" height="34.5"/>
                                                         <state key="normal" title="Capture Transaction"/>
                                                         <connections>
                                                             <action selector="captureTransaction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="kff-pT-Uf4"/>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jwi-v3-e8T">
-                                                        <rect key="frame" x="0.0" y="93" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="103.5" width="216.5" height="34.5"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="loremIpsumButton"/>
                                                         <state key="normal" title="Lorem Ipsum"/>
                                                         <connections>
@@ -140,7 +154,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8CV-WC-ffq">
-                                                        <rect key="frame" x="0.0" y="124" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="138" width="216.5" height="34.5"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="testNavigationTransactionButton"/>
                                                         <state key="normal" title="Image"/>
                                                         <connections>
@@ -148,7 +162,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LvU-yx-01i">
-                                                        <rect key="frame" x="0.0" y="155" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="172.5" width="216.5" height="34.5"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="showNibButton"/>
                                                         <state key="normal" title="Show Nib"/>
                                                         <connections>
@@ -156,7 +170,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RjO-LN-eHj">
-                                                        <rect key="frame" x="0.0" y="186" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="207" width="216.5" height="34.5"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="showTableViewButton"/>
                                                         <state key="normal" title="TableView"/>
                                                         <connections>
@@ -164,7 +178,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ok0-hq-2kK">
-                                                        <rect key="frame" x="0.0" y="217" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="241.5" width="216.5" height="34.5"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="showSplitViewButton"/>
                                                         <state key="normal" title="SplitView"/>
                                                         <connections>
@@ -172,7 +186,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cTC-V8-T1j">
-                                                        <rect key="frame" x="0.0" y="248" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="276" width="216.5" height="34.5"/>
                                                         <accessibility key="accessibilityConfiguration" identifier="useCoreData"/>
                                                         <state key="normal" title="Core Data"/>
                                                         <connections>
@@ -180,7 +194,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ld2-mz-wQD">
-                                                        <rect key="frame" x="0.0" y="279" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="310.5" width="216.5" height="34.5"/>
                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                         <state key="normal" title="Performance scenarios"/>
                                                         <connections>
@@ -188,7 +202,7 @@
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WRX-HQ-DjW">
-                                                        <rect key="frame" x="0.0" y="310" width="216.5" height="31"/>
+                                                        <rect key="frame" x="0.0" y="345" width="216.5" height="34.5"/>
                                                         <state key="normal" title="Button"/>
                                                         <buttonConfiguration key="configuration" style="plain" title="Flush"/>
                                                         <connections>
@@ -200,7 +214,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="UrL-kT-AJU">
-                                        <rect key="frame" x="0.0" y="341" width="398" height="165.5"/>
+                                        <rect key="frame" x="0.0" y="390" width="398" height="165.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DSN  " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m3h-wb-Xfa">
                                                 <rect key="frame" x="8" y="32" width="382" height="20.5"/>
@@ -273,7 +287,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="oQQ-QQ-VWP">
-                                <rect key="frame" x="87" y="108" width="240" height="240"/>
+                                <rect key="frame" x="87" y="112" width="240" height="240"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="240" id="iMc-sb-nxg"/>
                                     <constraint firstAttribute="width" constant="240" id="uUA-q8-18d"/>
@@ -317,11 +331,11 @@
             <objects>
                 <viewController id="ikl-rF-hao" customClass="SplitRootViewController" customModule="iOS_Swift" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="146-N0-BiP">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This is Split Root ViewController" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5bi-2z-fqb">
-                                <rect key="frame" x="85.5" y="438.5" width="243" height="21"/>
+                                <rect key="frame" x="85.5" y="436.5" width="243" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -369,7 +383,7 @@
             <objects>
                 <viewController id="g8o-dT-S6v" customClass="SecondarySplitViewController" customModule="iOS_Swift" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="BKf-tT-kLA">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="838"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <viewLayoutGuide key="safeArea" id="puK-Su-Cjb"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -420,7 +434,7 @@
             <objects>
                 <navigationController id="5CD-RQ-aBU" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="SjT-Zj-cMF">
-                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="48" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -434,7 +448,7 @@
     </scenes>
     <resources>
         <systemColor name="labelColor">
-            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/Samples/iOS-Swift/iOS-Swift/ViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
index f2cdf70a89f..b74e9c1d001 100644
--- a/Samples/iOS-Swift/iOS-Swift/ViewController.swift
+++ b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
@@ -20,7 +20,7 @@ class ViewController: UIViewController {
             scope.setTag(value: "swift", key: "language")
             scope.setExtra(value: String(describing: self), key: "currentViewController")
 
-            let user = SentryUser(userId: "1")
+            let user = User(userId: "1")
             user.email = "tony@example.com"
             scope.setUser(user)
             
@@ -33,7 +33,7 @@ class ViewController: UIViewController {
         }
 
         // Also works
-        let user = SentryUser(userId: "1")
+        let user = User(userId: "1")
         user.email = "tony1@example.com"
         SentrySDK.setUser(user)
         
@@ -289,4 +289,11 @@ class ViewController: UIViewController {
         SentrySDK.flush(timeout: 5)
     }
     
+    @IBAction func close(_ sender: Any) {
+        SentrySDK.close()
+    }
+    
+    @IBAction func startSDK(_ sender: Any) {
+        AppDelegate.startSentry()
+    }
 }
diff --git a/Samples/iOS-Swift/iOS13-Swift/AppDelegate.swift b/Samples/iOS-Swift/iOS13-Swift/AppDelegate.swift
index 8a0aff71350..bb450355ee7 100644
--- a/Samples/iOS-Swift/iOS13-Swift/AppDelegate.swift
+++ b/Samples/iOS-Swift/iOS13-Swift/AppDelegate.swift
@@ -5,26 +5,30 @@ import UIKit
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     static let defaultDSN = "https://6cc9bae94def43cab8444a99e0031c28@o447951.ingest.sentry.io/5428557"
+    
+    static func startSentry() {
+        // For testing purposes, we want to be able to change the DSN and store it to disk. In a real app, you shouldn't need this behavior.
+        let dsn = DSNStorage.shared.getDSN() ?? AppDelegate.defaultDSN
+        DSNStorage.shared.saveDSN(dsn: dsn)
+        
+        SentrySDK.start { options in
+            options.dsn = dsn
+            options.beforeSend = { event in
+                return event
+            }
+            options.debug = true
+            // Sampling 100% - In Production you probably want to adjust this
+            options.tracesSampleRate = 1.0
+            options.sessionTrackingIntervalMillis = 5_000
+            if ProcessInfo.processInfo.arguments.contains("--io.sentry.profiling.enable") {
+                options.profilesSampleRate = 1
+            }
+        }
+    }
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
                    
-            // For testing purposes, we want to be able to change the DSN and store it to disk. In a real app, you shouldn't need this behavior.
-            let dsn = DSNStorage.shared.getDSN() ?? AppDelegate.defaultDSN
-            DSNStorage.shared.saveDSN(dsn: dsn)
-            
-            SentrySDK.start { options in
-                options.dsn = dsn
-                options.beforeSend = { event in
-                    return event
-                }
-                options.debug = true
-                // Sampling 100% - In Production you probably want to adjust this
-                options.tracesSampleRate = 1.0
-                options.sessionTrackingIntervalMillis = 5_000
-                if ProcessInfo.processInfo.arguments.contains("--io.sentry.profiling.enable") {
-                    options.profilesSampleRate = 1
-                }
-            }
+        AppDelegate.startSentry()
         
         return true
     }
diff --git a/Sentry.podspec b/Sentry.podspec
index 3c541534486..7167eead875 100644
--- a/Sentry.podspec
+++ b/Sentry.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Sentry"
-  s.version      = "7.31.2"
+  s.version      = "7.31.3"
   s.summary      = "Sentry client for cocoa"
   s.homepage     = "https://github.com/getsentry/sentry-cocoa"
   s.license      = "mit"
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
index 8bae595a59f..0e75a6d7949 100644
--- a/Sentry.xcodeproj/project.pbxproj
+++ b/Sentry.xcodeproj/project.pbxproj
@@ -379,6 +379,7 @@
 		7B6D98EB24C6E84F005502FA /* SentryCrashInstallationReporterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D98EA24C6E84F005502FA /* SentryCrashInstallationReporterTests.swift */; };
 		7B6D98ED24C703F8005502FA /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B6D98EC24C703F8005502FA /* Async.swift */; };
 		7B72D23A28D074BC0014798A /* TestExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B72D23928D074BC0014798A /* TestExtensions.swift */; };
+		7B7725D8292F5DC20015BBF9 /* SentryCrashInstallationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B7725D7292F5DC20015BBF9 /* SentryCrashInstallationTests.m */; };
 		7B77BE3527EC8445003C9020 /* SentryDiscardReasonMapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B77BE3427EC8445003C9020 /* SentryDiscardReasonMapper.h */; };
 		7B77BE3727EC8460003C9020 /* SentryDiscardReasonMapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B77BE3627EC8460003C9020 /* SentryDiscardReasonMapper.m */; };
 		7B7A30C624B48321005A4C6E /* SentryCrashWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B7A30C524B48321005A4C6E /* SentryCrashWrapper.h */; };
@@ -1147,6 +1148,7 @@
 		7B6D98EA24C6E84F005502FA /* SentryCrashInstallationReporterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashInstallationReporterTests.swift; sourceTree = "<group>"; };
 		7B6D98EC24C703F8005502FA /* Async.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
 		7B72D23928D074BC0014798A /* TestExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestExtensions.swift; sourceTree = "<group>"; };
+		7B7725D7292F5DC20015BBF9 /* SentryCrashInstallationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryCrashInstallationTests.m; sourceTree = "<group>"; };
 		7B77BE3427EC8445003C9020 /* SentryDiscardReasonMapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDiscardReasonMapper.h; path = include/SentryDiscardReasonMapper.h; sourceTree = "<group>"; };
 		7B77BE3627EC8460003C9020 /* SentryDiscardReasonMapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDiscardReasonMapper.m; sourceTree = "<group>"; };
 		7B7A30C524B48321005A4C6E /* SentryCrashWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryCrashWrapper.h; path = include/SentryCrashWrapper.h; sourceTree = "<group>"; };
@@ -2234,6 +2236,7 @@
 				63FE71F120DA66EA00CDBAE8 /* Container+DeepSearch_Tests.m */,
 				63FE71F620DA66EB00CDBAE8 /* FileBasedTestCase.h */,
 				63FE71D920DA66E700CDBAE8 /* FileBasedTestCase.m */,
+				7B7725D7292F5DC20015BBF9 /* SentryCrashInstallationTests.m */,
 				D855AD61286ED6A4002573E1 /* SentryCrashTests.m */,
 				63FE71E220DA66E800CDBAE8 /* NSError+SimpleConstructor_Tests.m */,
 				63FE71D520DA66E600CDBAE8 /* RFC3339UTFString_Tests.m */,
@@ -3747,6 +3750,7 @@
 				7BED3576266F7BFF00EAA70D /* TestSentryCrashWrapper.m in Sources */,
 				7BC6EC18255C44540059822A /* SentryDebugMetaTests.swift in Sources */,
 				A811D867248E2770008A41EA /* SentrySystemEventBreadcrumbsTest.swift in Sources */,
+				7B7725D8292F5DC20015BBF9 /* SentryCrashInstallationTests.m in Sources */,
 				7B82D54924E2A2D400EE670F /* SentryIdTests.swift in Sources */,
 				7BD47B4E268F0B470076A663 /* ClearTestState.swift in Sources */,
 				7B6D98ED24C703F8005502FA /* Async.swift in Sources */,
diff --git a/Sources/Configuration/Sentry.xcconfig b/Sources/Configuration/Sentry.xcconfig
index 6464bc42d16..1a1228c17ef 100644
--- a/Sources/Configuration/Sentry.xcconfig
+++ b/Sources/Configuration/Sentry.xcconfig
@@ -1,5 +1,5 @@
 PRODUCT_NAME = Sentry
-CURRENT_PROJECT_VERSION = 7.31.2
+CURRENT_PROJECT_VERSION = 7.31.3
 INFOPLIST_FILE = Sources/Sentry/Info.plist
 PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry
 
diff --git a/Sources/Sentry/Public/SentryUser.h b/Sources/Sentry/Public/SentryUser.h
index 3ce0b197a77..497d6337feb 100644
--- a/Sources/Sentry/Public/SentryUser.h
+++ b/Sources/Sentry/Public/SentryUser.h
@@ -3,6 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+NS_SWIFT_NAME(User)
 @interface SentryUser : NSObject <SentrySerializable, NSCopying>
 
 /**
diff --git a/Sources/Sentry/SentryCoreDataTracker.m b/Sources/Sentry/SentryCoreDataTracker.m
index ef592ff7842..98567e4a56d 100644
--- a/Sources/Sentry/SentryCoreDataTracker.m
+++ b/Sources/Sentry/SentryCoreDataTracker.m
@@ -50,7 +50,7 @@ - (NSArray *)managedObjectContext:(NSManagedObjectContext *)context
         [fetchSpan setDataValue:[NSNumber numberWithInteger:result.count] forKey:@"read_count"];
 
         [fetchSpan
-            finishWithStatus:error != nil ? kSentrySpanStatusInternalError : kSentrySpanStatusOk];
+            finishWithStatus:result == nil ? kSentrySpanStatusInternalError : kSentrySpanStatusOk];
 
         SENTRY_LOG_DEBUG(@"SentryCoreDataTracker automatically finished span with status: %@",
             error == nil ? @"ok" : @"error");
@@ -91,8 +91,7 @@ - (BOOL)managedObjectContext:(NSManagedObjectContext *)context
     BOOL result = original(error);
 
     if (fetchSpan) {
-        [fetchSpan
-            finishWithStatus:*error != nil ? kSentrySpanStatusInternalError : kSentrySpanStatusOk];
+        [fetchSpan finishWithStatus:result ? kSentrySpanStatusOk : kSentrySpanStatusInternalError];
 
         SENTRY_LOG_DEBUG(@"SentryCoreDataTracker automatically finished span with status: %@",
             *error == nil ? @"ok" : @"error");
diff --git a/Sources/Sentry/SentryCrashIntegration.m b/Sources/Sentry/SentryCrashIntegration.m
index ba6035a349b..f1cdc32c37b 100644
--- a/Sources/Sentry/SentryCrashIntegration.m
+++ b/Sources/Sentry/SentryCrashIntegration.m
@@ -157,10 +157,12 @@ + (void)sendAllSentryCrashReports
 - (void)uninstall
 {
     if (nil != installation) {
-        [self.crashAdapter close];
+        [installation uninstall];
         installationToken = 0;
     }
 
+    [self.crashAdapter uninstallAsyncHooks];
+
     [NSNotificationCenter.defaultCenter removeObserver:self
                                                   name:NSCurrentLocaleDidChangeNotification
                                                 object:nil];
diff --git a/Sources/Sentry/SentryCrashWrapper.m b/Sources/Sentry/SentryCrashWrapper.m
index a92a7c7d31e..d6e80fc3a8c 100644
--- a/Sources/Sentry/SentryCrashWrapper.m
+++ b/Sources/Sentry/SentryCrashWrapper.m
@@ -56,16 +56,9 @@ - (void)installAsyncHooks
     sentrycrash_install_async_hooks();
 }
 
-- (void)close
+- (void)uninstallAsyncHooks
 {
-    SentryCrash *handler = [SentryCrash sharedInstance];
-    @synchronized(handler) {
-        [handler setMonitoring:SentryCrashMonitorTypeNone];
-        handler.onCrash = NULL;
-    }
-
     sentrycrash_deactivate_async_hooks();
-    sentrycrashccd_close();
 }
 
 - (NSDictionary *)systemInfo
diff --git a/Sources/Sentry/SentryMeta.m b/Sources/Sentry/SentryMeta.m
index 261725c7178..578422b3276 100644
--- a/Sources/Sentry/SentryMeta.m
+++ b/Sources/Sentry/SentryMeta.m
@@ -5,7 +5,7 @@ @implementation SentryMeta
 // Don't remove the static keyword. If you do the compiler adds the constant name to the global
 // symbol table and it might clash with other constants. When keeping the static keyword the
 // compiler replaces all occurrences with the value.
-static NSString *versionString = @"7.31.2";
+static NSString *versionString = @"7.31.3";
 static NSString *sdkName = @"sentry.cocoa";
 
 + (NSString *)versionString
diff --git a/Sources/Sentry/include/SentryCrashWrapper.h b/Sources/Sentry/include/SentryCrashWrapper.h
index 7e88021293b..cd4142ab4b4 100644
--- a/Sources/Sentry/include/SentryCrashWrapper.h
+++ b/Sources/Sentry/include/SentryCrashWrapper.h
@@ -25,11 +25,7 @@ SENTRY_NO_INIT
 
 - (void)installAsyncHooks;
 
-/**
- * It's not really possible to close SentryCrash. Best we can do is to deactivate all the monitors,
- * clear the `onCrash` callback installed on the global handler, and a few more minor things.
- */
-- (void)close;
+- (void)uninstallAsyncHooks;
 
 - (NSDictionary *)systemInfo;
 
diff --git a/Sources/SentryCrash/Installations/SentryCrashInstallation+Private.h b/Sources/SentryCrash/Installations/SentryCrashInstallation+Private.h
index 95da4946025..ccb0605db57 100644
--- a/Sources/SentryCrash/Installations/SentryCrashInstallation+Private.h
+++ b/Sources/SentryCrash/Installations/SentryCrashInstallation+Private.h
@@ -51,6 +51,17 @@
     IMPLEMENT_REPORT_VALUE_PROPERTY(NAME, NAMEUPPER, TYPE)                                         \
     IMPLEMENT_REPORT_KEY_PROPERTY(NAME, NAMEUPPER)
 
+typedef struct {
+    const char *key;
+    const char *value;
+} ReportField;
+
+typedef struct {
+    SentryCrashReportWriteCallback userCrashCallback;
+    int reportFieldsCount;
+    ReportField *reportFields[0];
+} CrashHandlerData;
+
 @interface
 SentryCrashInstallation ()
 
@@ -84,4 +95,7 @@ SentryCrashInstallation ()
 /** Make an absolute key paths from the specified paths. */
 - (NSArray *)makeKeyPaths:(NSArray *)keyPaths;
 
+/** Only needed for testing */
+- (CrashHandlerData *)g_crashHandlerData;
+
 @end
diff --git a/Sources/SentryCrash/Installations/SentryCrashInstallation.h b/Sources/SentryCrash/Installations/SentryCrashInstallation.h
index 32b8bf7b098..4eba18e1f67 100644
--- a/Sources/SentryCrash/Installations/SentryCrashInstallation.h
+++ b/Sources/SentryCrash/Installations/SentryCrashInstallation.h
@@ -49,6 +49,11 @@
  */
 - (void)install;
 
+/**
+ * Call this instead of `-[SentryCrash uninstall]`.
+ */
+- (void)uninstall;
+
 /** Convenience method to call -[SentryCrash sendAllReportsWithCompletion:].
  * This method will set the SentryCrash sink and then send all outstanding
  * reports.
diff --git a/Sources/SentryCrash/Installations/SentryCrashInstallation.m b/Sources/SentryCrash/Installations/SentryCrashInstallation.m
index 6bc479eeb20..763613f371c 100644
--- a/Sources/SentryCrash/Installations/SentryCrashInstallation.m
+++ b/Sources/SentryCrash/Installations/SentryCrashInstallation.m
@@ -37,17 +37,6 @@
 /** Max number of properties that can be defined for writing to the report */
 #define kMaxProperties 500
 
-typedef struct {
-    const char *key;
-    const char *value;
-} ReportField;
-
-typedef struct {
-    SentryCrashReportWriteCallback userCrashCallback;
-    int reportFieldsCount;
-    ReportField *reportFields[0];
-} CrashHandlerData;
-
 static CrashHandlerData *g_crashHandlerData;
 
 static void
@@ -199,6 +188,11 @@ - (CrashHandlerData *)crashHandlerData
     return (CrashHandlerData *)self.crashHandlerDataBacking.mutableBytes;
 }
 
+- (CrashHandlerData *)g_crashHandlerData
+{
+    return g_crashHandlerData;
+}
+
 - (SentryCrashInstReportField *)reportFieldForProperty:(NSString *)propertyName
 {
     SentryCrashInstReportField *field = [self.fields objectForKey:propertyName];
@@ -298,6 +292,18 @@ - (void)install
     }
 }
 
+- (void)uninstall
+{
+    SentryCrash *handler = [SentryCrash sharedInstance];
+    @synchronized(handler) {
+        if (g_crashHandlerData == self.crashHandlerData) {
+            g_crashHandlerData = NULL;
+            handler.onCrash = NULL;
+        }
+        [handler uninstall];
+    }
+}
+
 - (void)sendAllReportsWithCompletion:(SentryCrashReportFilterCompletion)onCompletion
 {
     NSError *error = [self validateProperties];
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.c b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.c
index 4022f696284..f80c27b72b6 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.c
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.c
@@ -141,11 +141,17 @@ addContextualInfoToEvent(Monitor *monitor, struct SentryCrash_MonitorContext *ev
 }
 
 void
-sentrycrashcm_setEventCallback(void (*onEvent)(struct SentryCrash_MonitorContext *monitorContext))
+sentrycrashcm_setEventCallback(SentryCrashMonitorEventCallback onEvent)
 {
     g_onExceptionEvent = onEvent;
 }
 
+SentryCrashMonitorEventCallback
+sentrycrashcm_getEventCallback(void)
+{
+    return g_onExceptionEvent;
+}
+
 void
 sentrycrashcm_setActiveMonitors(SentryCrashMonitorType monitorTypes)
 {
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.h b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.h
index 507068fbc3a..0c8e3d17680 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.h
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor.h
@@ -55,12 +55,18 @@ void sentrycrashcm_setActiveMonitors(SentryCrashMonitorType monitorTypes);
  */
 SentryCrashMonitorType sentrycrashcm_getActiveMonitors(void);
 
+typedef void (*SentryCrashMonitorEventCallback)(struct SentryCrash_MonitorContext *);
+
 /** Set the callback to call when an event is captured.
  *
  * @param onEvent Called whenever an event is captured.
  */
-void sentrycrashcm_setEventCallback(
-    void (*onEvent)(struct SentryCrash_MonitorContext *monitorContext));
+void sentrycrashcm_setEventCallback(SentryCrashMonitorEventCallback onEvent);
+
+/** Get the current SentryCrashMonitorEventCallback. Only needed for testing.
+ *
+ */
+SentryCrashMonitorEventCallback sentrycrashcm_getEventCallback(void);
 
 // ============================================================================
 #pragma mark - Internal API -
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c
index 7e73a4e8302..93a5f52d652 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.c
@@ -109,6 +109,7 @@ typedef struct {
 // ============================================================================
 
 static volatile bool g_isEnabled = false;
+static volatile bool g_isInstalled = false;
 
 static SentryCrash_MonitorContext g_monitorContext;
 static SentryCrashStackCursor g_stackCursor;
@@ -236,6 +237,42 @@ machExceptionForSignal(int sigNum)
     return 0;
 }
 
+// ============================================================================
+#    pragma mark - Reserved threads -
+// ============================================================================
+/**
+ * We only have reserved threads if SentryCrashCRASH_HAS_MACH.
+ */
+
+bool
+sentrycrashcm_isReservedThread(thread_t thread)
+{
+    return thread == g_primaryMachThread || thread == g_secondaryMachThread;
+}
+
+bool
+sentrycrashcm_hasReservedThreads(void)
+{
+    return g_primaryMachThread != 0 && g_secondaryMachThread != 0;
+}
+
+#else
+bool
+sentrycrashcm_isReservedThread(thread_t thread)
+{
+    return false;
+}
+
+bool
+sentrycrashcm_hasReservedThreads(void)
+{
+    return false;
+}
+
+#endif
+
+#if SentryCrashCRASH_HAS_MACH
+
 // ============================================================================
 #    pragma mark - Handler -
 // ============================================================================
@@ -458,7 +495,6 @@ installExceptionHandler()
         goto failed;
     }
     g_secondaryMachThread = pthread_mach_thread_np(g_secondaryPThread);
-    sentrycrashmc_addReservedThread(g_secondaryMachThread);
 
     SentryCrashLOG_DEBUG("Creating primary exception thread.");
     error = pthread_create(&g_primaryPThread, &attr, &handleExceptions, kThreadPrimary);
@@ -468,9 +504,9 @@ installExceptionHandler()
     }
     pthread_attr_destroy(&attr);
     g_primaryMachThread = pthread_mach_thread_np(g_primaryPThread);
-    sentrycrashmc_addReservedThread(g_primaryMachThread);
 
     SentryCrashLOG_DEBUG("Mach exception handler installed.");
+    g_isInstalled = true;
     return true;
 
 failed:
@@ -485,18 +521,18 @@ installExceptionHandler()
 static void
 setEnabled(bool isEnabled)
 {
-    if (isEnabled != g_isEnabled) {
-        g_isEnabled = isEnabled;
-        if (isEnabled) {
-            sentrycrashid_generate(g_primaryEventID);
-            sentrycrashid_generate(g_secondaryEventID);
-            if (!installExceptionHandler()) {
-                return;
-            }
-        } else {
-            uninstallExceptionHandler();
-        }
+    g_isEnabled = isEnabled;
+    if (g_isEnabled && !g_isInstalled) {
+        sentrycrashid_generate(g_primaryEventID);
+        sentrycrashid_generate(g_secondaryEventID);
+        g_isEnabled = installExceptionHandler();
     }
+
+    // We don't call uninstallExceptionHandler by intention. Instead of canceling the exception
+    // handler threads and restarting them, we let them run. They won't do anything in
+    // handleExceptions when g_isEnabled is false. Trying to clean them up lead to weird crashes in
+    // tests cause sentrycrashmc_suspendEnvironment and sentrycrashmc_resumeEnvironment call
+    // sentrycrashcm_isReservedThread. Instead of fixing that, we let them run.
 }
 
 static bool
diff --git a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.h b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.h
index 7ae26e6795c..013db661ef8 100644
--- a/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.h
+++ b/Sources/SentryCrash/Recording/Monitors/SentryCrashMonitor_MachException.h
@@ -35,12 +35,19 @@ extern "C" {
 #endif
 
 #include "SentryCrashMonitor.h"
+#include <mach/mach.h>
 #include <stdbool.h>
 
 /** Access the Monitor API.
  */
 SentryCrashMonitorAPI *sentrycrashcm_machexception_getAPI(void);
 
+bool sentrycrashcm_isReservedThread(thread_t thread);
+
+/** Only needed for testing.
+ */
+bool sentrycrashcm_hasReservedThreads(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Sources/SentryCrash/Recording/SentryCrash.h b/Sources/SentryCrash/Recording/SentryCrash.h
index e0e60a3ce0c..a78363d5a2c 100644
--- a/Sources/SentryCrash/Recording/SentryCrash.h
+++ b/Sources/SentryCrash/Recording/SentryCrash.h
@@ -43,6 +43,8 @@ typedef enum {
 
 static NSString *const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
 
+@class SentryNSNotificationCenterWrapper;
+
 /**
  * Reports any crashes that occur in the application.
  *
@@ -139,10 +141,6 @@ static NSString *const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
  */
 @property (nonatomic, readwrite, assign) SentryCrashReportWriteCallback onCrash;
 
-/** Add a copy of SentryCrash's console log messages to the crash report.
- */
-@property (nonatomic, readwrite, assign) BOOL addConsoleLogToReport;
-
 /** Print the previous app run log to the console when installing SentryCrash.
  *  This is primarily for debugging purposes.
  */
@@ -202,6 +200,15 @@ static NSString *const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
  */
 - (BOOL)install;
 
+/**
+ * It's not really possible to completely uninstall SentryCrash. The best we can do is to deactivate
+ * all the monitors, keep track of the already installed monitors to install them again if someone
+ * calls install, clear the `onCrash` callback, and stop the SentryCrashCachedData. For the
+ * ``SentryCrashMonitorTypeMachException`` we let the exception threads running, but they don't
+ * report anything.
+ */
+- (void)uninstall;
+
 /** Send all outstanding crash reports to the current sink.
  * It will only attempt to send the most recent 5 reports. All others will be
  * deleted. Once the reports are successfully sent to the server, they may be
@@ -239,6 +246,12 @@ static NSString *const SENTRYCRASH_REPORT_ATTACHMENTS_ITEM = @"attachments";
  */
 - (void)deleteReportWithID:(NSNumber *)reportID;
 
+/**
+ * Only needed for testing.
+ */
+- (void)setSentryNSNotificationCenterWrapper:
+    (SentryNSNotificationCenterWrapper *)notificationCenter;
+
 @end
 
 //! Project version number for SentryCrashFramework.
diff --git a/Sources/SentryCrash/Recording/SentryCrash.m b/Sources/SentryCrash/Recording/SentryCrash.m
index fc113201027..bda3b8cc027 100644
--- a/Sources/SentryCrash/Recording/SentryCrash.m
+++ b/Sources/SentryCrash/Recording/SentryCrash.m
@@ -36,6 +36,8 @@
 #import "SentryCrashReportFields.h"
 #import "SentryCrashReportStore.h"
 #import "SentryCrashSystemCapabilities.h"
+#import "SentryDependencyContainer.h"
+#import "SentryNSNotificationCenterWrapper.h"
 #import <NSData+Sentry.h>
 
 // #define SentryCrashLogger_LocalLevel TRACE
@@ -55,6 +57,9 @@
 
 @property (nonatomic, readwrite, retain) NSString *bundleName;
 @property (nonatomic, readwrite, retain) NSString *basePath;
+@property (nonatomic, readwrite, assign) SentryCrashMonitorType monitoringWhenUninstalled;
+@property (nonatomic, readwrite, assign) BOOL monitoringFromUninstalledToRestore;
+@property (nonatomic, strong) SentryNSNotificationCenterWrapper *notificationCenter;
 
 @end
 
@@ -103,8 +108,6 @@ @implementation SentryCrash
 @synthesize catchZombies = _catchZombies;
 @synthesize doNotIntrospectClasses = _doNotIntrospectClasses;
 @synthesize demangleLanguages = _demangleLanguages;
-@synthesize addConsoleLogToReport = _addConsoleLogToReport;
-@synthesize printPreviousLog = _printPreviousLog;
 @synthesize maxReportCount = _maxReportCount;
 @synthesize uncaughtExceptionHandler = _uncaughtExceptionHandler;
 
@@ -141,6 +144,9 @@ - (id)initWithBasePath:(NSString *)basePath
         self.catchZombies = NO;
         self.maxReportCount = 5;
         self.monitoring = SentryCrashMonitorTypeProductionSafeMinimal;
+        self.monitoringFromUninstalledToRestore = NO;
+        self.notificationCenter =
+            [SentryDependencyContainer sharedInstance].notificationCenterWrapper;
     }
     return self;
 }
@@ -264,59 +270,86 @@ - (NSDictionary *)systemInfo
     return dict;
 }
 
+- (void)setSentryNSNotificationCenterWrapper:(SentryNSNotificationCenterWrapper *)notificationCenter
+{
+    self.notificationCenter = notificationCenter;
+}
+
 - (BOOL)install
 {
+    // Restore previous monitors when uninstall was called previously
+    if (self.monitoringFromUninstalledToRestore
+        && self.monitoringWhenUninstalled != SentryCrashMonitorTypeNone) {
+        [self setMonitoring:self.monitoringWhenUninstalled];
+        self.monitoringWhenUninstalled = SentryCrashMonitorTypeNone;
+        self.monitoringFromUninstalledToRestore = NO;
+    }
+
     _monitoring = sentrycrash_install(self.bundleName.UTF8String, self.basePath.UTF8String);
     if (self.monitoring == 0) {
         return false;
     }
 
 #if SentryCrashCRASH_HAS_UIAPPLICATION
-    NSNotificationCenter *nCenter = [NSNotificationCenter defaultCenter];
-    [nCenter addObserver:self
-                selector:@selector(applicationDidBecomeActive)
-                    name:UIApplicationDidBecomeActiveNotification
-                  object:nil];
-    [nCenter addObserver:self
-                selector:@selector(applicationWillResignActive)
-                    name:UIApplicationWillResignActiveNotification
-                  object:nil];
-    [nCenter addObserver:self
-                selector:@selector(applicationDidEnterBackground)
-                    name:UIApplicationDidEnterBackgroundNotification
-                  object:nil];
-    [nCenter addObserver:self
-                selector:@selector(applicationWillEnterForeground)
-                    name:UIApplicationWillEnterForegroundNotification
-                  object:nil];
-    [nCenter addObserver:self
-                selector:@selector(applicationWillTerminate)
-                    name:UIApplicationWillTerminateNotification
-                  object:nil];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationDidBecomeActive)
+                                    name:UIApplicationDidBecomeActiveNotification];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationWillResignActive)
+                                    name:UIApplicationWillResignActiveNotification];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationDidEnterBackground)
+                                    name:UIApplicationDidEnterBackgroundNotification];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationWillEnterForeground)
+                                    name:UIApplicationWillEnterForegroundNotification];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationWillTerminate)
+                                    name:UIApplicationWillTerminateNotification];
 #endif
 #if SentryCrashCRASH_HAS_NSEXTENSION
-    NSNotificationCenter *nCenter = [NSNotificationCenter defaultCenter];
-    [nCenter addObserver:self
-                selector:@selector(applicationDidBecomeActive)
-                    name:NSExtensionHostDidBecomeActiveNotification
-                  object:nil];
-    [nCenter addObserver:self
-                selector:@selector(applicationWillResignActive)
-                    name:NSExtensionHostWillResignActiveNotification
-                  object:nil];
-    [nCenter addObserver:self
-                selector:@selector(applicationDidEnterBackground)
-                    name:NSExtensionHostDidEnterBackgroundNotification
-                  object:nil];
-    [nCenter addObserver:self
-                selector:@selector(applicationWillEnterForeground)
-                    name:NSExtensionHostWillEnterForegroundNotification
-                  object:nil];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationDidBecomeActive)
+                                    name:NSExtensionHostDidBecomeActiveNotification];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationWillResignActive)
+                                    name:NSExtensionHostWillResignActiveNotification];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationDidEnterBackground)
+                                    name:NSExtensionHostDidEnterBackgroundNotification];
+    [self.notificationCenter addObserver:self
+                                selector:@selector(applicationWillEnterForeground)
+                                    name:NSExtensionHostWillEnterForegroundNotification];
 #endif
 
     return true;
 }
 
+- (void)uninstall
+{
+    self.monitoringWhenUninstalled = self.monitoring;
+    [self setMonitoring:SentryCrashMonitorTypeNone];
+    self.monitoringFromUninstalledToRestore = YES;
+    self.onCrash = NULL;
+    sentrycrash_uninstall();
+
+#if SentryCrashCRASH_HAS_UIAPPLICATION
+    [self.notificationCenter removeObserver:self name:UIApplicationDidBecomeActiveNotification];
+    [self.notificationCenter removeObserver:self name:UIApplicationWillResignActiveNotification];
+    [self.notificationCenter removeObserver:self name:UIApplicationDidEnterBackgroundNotification];
+    [self.notificationCenter removeObserver:self name:UIApplicationWillEnterForegroundNotification];
+    [self.notificationCenter removeObserver:self name:UIApplicationWillTerminateNotification];
+#endif
+#if SentryCrashCRASH_HAS_NSEXTENSION
+    [self.notificationCenter removeObserver:self name:NSExtensionHostDidBecomeActiveNotification];
+    [self.notificationCenter removeObserver:self name:NSExtensionHostWillResignActiveNotification];
+    [self.notificationCenter removeObserver:self
+                                       name:NSExtensionHostDidEnterBackgroundNotification];
+    [self.notificationCenter removeObserver:self
+                                       name:NSExtensionHostWillEnterForegroundNotification];
+#endif
+}
+
 - (void)sendAllReportsWithCompletion:(SentryCrashReportFilterCompletion)onCompletion
 {
     NSArray *reports = [self allReports];
@@ -505,16 +538,9 @@ - (NSArray *)allReports
     return reports;
 }
 
-- (void)setAddConsoleLogToReport:(BOOL)shouldAddConsoleLogToReport
-{
-    _addConsoleLogToReport = shouldAddConsoleLogToReport;
-    sentrycrash_setAddConsoleLogToReport(shouldAddConsoleLogToReport);
-}
-
 - (void)setPrintPreviousLog:(BOOL)shouldPrintPreviousLog
 {
     _printPreviousLog = shouldPrintPreviousLog;
-    sentrycrash_setPrintPreviousLog(shouldPrintPreviousLog);
 }
 
 // ============================================================================
diff --git a/Sources/SentryCrash/Recording/SentryCrashC.c b/Sources/SentryCrash/Recording/SentryCrashC.c
index 15d3a05fd02..1ecd32fbfe6 100644
--- a/Sources/SentryCrash/Recording/SentryCrashC.c
+++ b/Sources/SentryCrash/Recording/SentryCrashC.c
@@ -54,9 +54,6 @@
 /** True if SentryCrash has been installed. */
 static volatile bool g_installed = 0;
 
-static bool g_shouldAddConsoleLogToReport = false;
-static bool g_shouldPrintPreviousLog = false;
-static char g_consoleLogPath[SentryCrashFU_MAX_PATH_LENGTH];
 static SentryCrashMonitorType g_monitoring = SentryCrashMonitorTypeProductionSafeMinimal;
 static char g_lastCrashReportFilePath[SentryCrashFU_MAX_PATH_LENGTH];
 static void (*g_saveScreenShot)(const char *) = 0;
@@ -66,21 +63,6 @@ static void (*g_saveViewHierarchy)(const char *) = 0;
 #pragma mark - Utility -
 // ============================================================================
 
-static void
-printPreviousLog(const char *filePath)
-{
-    char *data;
-    int length;
-    if (sentrycrashfu_readEntireFile(filePath, &data, &length, 0)) {
-        printf("\nvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Previous Log "
-               "vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv\n\n");
-        printf("%s\n", data);
-        printf("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
-               "^^^^^^^^^^^^^^^^^^^^^\n\n");
-        fflush(stdout);
-    }
-}
-
 // ============================================================================
 #pragma mark - Callbacks -
 // ============================================================================
@@ -95,8 +77,6 @@ onCrash(struct SentryCrash_MonitorContext *monitorContext)
     SentryCrashLOG_DEBUG("Updating application state to note crash.");
     sentrycrashstate_notifyAppCrash();
 
-    monitorContext->consoleLogPath = g_shouldAddConsoleLogToReport ? g_consoleLogPath : NULL;
-
     if (monitorContext->crashedDuringCrashHandling) {
         sentrycrashreport_writeRecrashReport(monitorContext, g_lastCrashReportFilePath);
     } else {
@@ -154,12 +134,6 @@ sentrycrash_install(const char *appName, const char *const installPath)
     snprintf(path, sizeof(path), "%s/Data/CrashState.json", installPath);
     sentrycrashstate_initialize(path);
 
-    snprintf(g_consoleLogPath, sizeof(g_consoleLogPath), "%s/Data/ConsoleLog.txt", installPath);
-    if (g_shouldPrintPreviousLog) {
-        printPreviousLog(g_consoleLogPath);
-    }
-    sentrycrashlog_setLogFilename(g_consoleLogPath, true);
-
     sentrycrashccd_init(60);
 
     sentrycrashcm_setEventCallback(onCrash);
@@ -169,6 +143,14 @@ sentrycrash_install(const char *appName, const char *const installPath)
     return monitors;
 }
 
+void
+sentrycrash_uninstall(void)
+{
+    sentrycrashcm_setEventCallback(NULL);
+    g_installed = 0;
+    sentrycrashccd_close();
+}
+
 SentryCrashMonitorType
 sentrycrash_setMonitoring(SentryCrashMonitorType monitors)
 {
@@ -200,18 +182,6 @@ sentrycrash_setDoNotIntrospectClasses(const char **doNotIntrospectClasses, int l
     sentrycrashreport_setDoNotIntrospectClasses(doNotIntrospectClasses, length);
 }
 
-void
-sentrycrash_setAddConsoleLogToReport(bool shouldAddConsoleLogToReport)
-{
-    g_shouldAddConsoleLogToReport = shouldAddConsoleLogToReport;
-}
-
-void
-sentrycrash_setPrintPreviousLog(bool shouldPrintPreviousLog)
-{
-    g_shouldPrintPreviousLog = shouldPrintPreviousLog;
-}
-
 void
 sentrycrash_setMaxReportCount(int maxReportCount)
 {
diff --git a/Sources/SentryCrash/Recording/SentryCrashC.h b/Sources/SentryCrash/Recording/SentryCrashC.h
index ed6b634e639..660a4ff84a6 100644
--- a/Sources/SentryCrash/Recording/SentryCrashC.h
+++ b/Sources/SentryCrash/Recording/SentryCrashC.h
@@ -48,6 +48,8 @@ extern "C" {
  */
 SentryCrashMonitorType sentrycrash_install(const char *appName, const char *const installPath);
 
+void sentrycrash_uninstall(void);
+
 /** Set the crash types that will be handled.
  * Some crash types may not be enabled depending on circumstances (e.g. running
  * in a debugger).
@@ -98,16 +100,9 @@ void sentrycrash_setDoNotIntrospectClasses(const char **doNotIntrospectClasses,
  */
 void sentrycrash_setCrashNotifyCallback(const SentryCrashReportWriteCallback onCrashNotify);
 
-/** Set if SentryCrashLOG console messages should be appended to the report.
- *
- * @param shouldAddConsoleLogToReport If true, add the log to the report.
- */
-void sentrycrash_setAddConsoleLogToReport(bool shouldAddConsoleLogToReport);
-
 /** Set if SentryCrash should print the previous log to the console on startup.
  *  This is for debugging purposes.
  */
-void sentrycrash_setPrintPreviousLog(bool shouldPrintPreviousLog);
 
 /** Set the maximum number of reports allowed on disk before old ones get
  * deleted.
diff --git a/Sources/SentryCrash/Recording/SentryCrashCachedData.c b/Sources/SentryCrash/Recording/SentryCrashCachedData.c
index 7e1362f3a33..efd8cfa2c27 100644
--- a/Sources/SentryCrash/Recording/SentryCrashCachedData.c
+++ b/Sources/SentryCrash/Recording/SentryCrashCachedData.c
@@ -174,6 +174,12 @@ sentrycrashccd_close()
     }
 }
 
+bool
+sentrycrashccd_hasThreadStarted(void)
+{
+    return g_hasThreadStarted;
+}
+
 void
 sentrycrashccd_freeze()
 {
diff --git a/Sources/SentryCrash/Recording/SentryCrashCachedData.h b/Sources/SentryCrash/Recording/SentryCrashCachedData.h
index 90ebf74f162..d0f35cbaedf 100644
--- a/Sources/SentryCrash/Recording/SentryCrashCachedData.h
+++ b/Sources/SentryCrash/Recording/SentryCrashCachedData.h
@@ -29,6 +29,7 @@
 
 void sentrycrashccd_init(int pollingIntervalInSeconds);
 void sentrycrashccd_close(void);
+bool sentrycrashccd_hasThreadStarted(void);
 
 void sentrycrashccd_freeze(void);
 void sentrycrashccd_unfreeze(void);
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.c b/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.c
index b626f0984ee..b6edb9b5496 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.c
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.c
@@ -204,39 +204,8 @@ flushLog(void)
     fflush(g_file);
 }
 
-bool
-sentrycrashlog_setLogFilename(const char *filename, bool overwrite)
-{
-    static FILE *file = NULL;
-    FILE *oldFile = file;
-    if (filename != NULL) {
-        file = fopen(filename, overwrite ? "wb" : "ab");
-        unlikely_if(file == NULL)
-        {
-            writeFmtToLog("SentryCrashLogger: Could not open %s: %s", filename, strerror(errno));
-            return false;
-        }
-    }
-    if (filename != g_logFilename) {
-        strncpy(g_logFilename, filename, sizeof(g_logFilename));
-    }
-
-    if (oldFile != NULL) {
-        fclose(oldFile);
-    }
-
-    setLogFD(file);
-    return true;
-}
-
 #endif
 
-bool
-sentrycrashlog_clearLogFile()
-{
-    return sentrycrashlog_setLogFilename(g_logFilename, true);
-}
-
 // ===========================================================================
 #pragma mark - C -
 // ===========================================================================
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.h b/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.h
index 765dc767831..5d0427cb173 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.h
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashLogger.h
@@ -237,17 +237,6 @@ void i_sentrycrashlog_logCBasic(const char *fmt, ...);
 #    pragma mark - API -
 // ============================================================================
 
-/** Set the filename to log to.
- *
- * @param filename The file to write to (NULL = write to stdout).
- *
- * @param overwrite If true, overwrite the log file.
- */
-bool sentrycrashlog_setLogFilename(const char *filename, bool overwrite);
-
-/** Clear the log file. */
-bool sentrycrashlog_clearLogFile(void);
-
 /** Tests if the logger would print at the specified level.
  *
  * @param LEVEL The level to test for. One of:
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c b/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c
index 7461add0290..fab1ff8c90a 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.c
@@ -28,6 +28,7 @@
 #include "SentryCrashCPU.h"
 #include "SentryCrashCPU_Apple.h"
 #include "SentryCrashMachineContext_Apple.h"
+#include "SentryCrashMonitor_MachException.h"
 #include "SentryCrashStackCursor_MachineContext.h"
 #include "SentryCrashSystemCapabilities.h"
 
@@ -44,10 +45,6 @@ typedef ucontext64_t SignalUserContext;
 typedef ucontext_t SignalUserContext;
 #endif
 
-static SentryCrashThread g_reservedThreads[10];
-static int g_reservedThreadsMaxIndex = sizeof(g_reservedThreads) / sizeof(g_reservedThreads[0]) - 1;
-static int g_reservedThreadsCount = 0;
-
 static inline bool
 isStackOverflow(const SentryCrashMachineContext *const context)
 {
@@ -146,31 +143,6 @@ sentrycrashmc_getContextForSignal(
     return true;
 }
 
-void
-sentrycrashmc_addReservedThread(SentryCrashThread thread)
-{
-    int nextIndex = g_reservedThreadsCount;
-    if (nextIndex > g_reservedThreadsMaxIndex) {
-        SentryCrashLOG_ERROR(
-            "Too many reserved threads (%d). Max is %d", nextIndex, g_reservedThreadsMaxIndex);
-        return;
-    }
-    g_reservedThreads[g_reservedThreadsCount++] = thread;
-}
-
-#if SentryCrashCRASH_HAS_THREADS_API
-static inline bool
-isThreadInList(thread_t thread, SentryCrashThread *list, int listCount)
-{
-    for (int i = 0; i < listCount; i++) {
-        if (list[i] == (SentryCrashThread)thread) {
-            return true;
-        }
-    }
-    return false;
-}
-#endif
-
 void
 sentrycrashmc_suspendEnvironment(
     thread_act_array_t *suspendedThreads, mach_msg_type_number_t *numSuspendedThreads)
@@ -188,8 +160,7 @@ sentrycrashmc_suspendEnvironment(
 
     for (mach_msg_type_number_t i = 0; i < *numSuspendedThreads; i++) {
         thread_t thread = (*suspendedThreads)[i];
-        if (thread != thisThread
-            && !isThreadInList(thread, g_reservedThreads, g_reservedThreadsCount)) {
+        if (thread != thisThread && !sentrycrashcm_isReservedThread(thread)) {
             if ((kr = thread_suspend(thread)) != KERN_SUCCESS) {
                 // Record the error and keep going.
                 SentryCrashLOG_ERROR("thread_suspend (%08x): %s", thread, mach_error_string(kr));
@@ -218,8 +189,7 @@ sentrycrashmc_resumeEnvironment(
 
     for (mach_msg_type_number_t i = 0; i < numThreads; i++) {
         thread_t thread = threads[i];
-        if (thread != thisThread
-            && !isThreadInList(thread, g_reservedThreads, g_reservedThreadsCount)) {
+        if (thread != thisThread && !sentrycrashcm_isReservedThread(thread)) {
             if ((kr = thread_resume(thread)) != KERN_SUCCESS) {
                 // Record the error and keep going.
                 SentryCrashLOG_ERROR("thread_resume (%08x): %s", thread, mach_error_string(kr));
diff --git a/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.h b/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.h
index 9f7e3b08568..798e6bfd3dd 100644
--- a/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.h
+++ b/Sources/SentryCrash/Recording/Tools/SentryCrashMachineContext.h
@@ -139,12 +139,6 @@ bool sentrycrashmc_canHaveCPUState(const struct SentryCrashMachineContext *const
 bool sentrycrashmc_hasValidExceptionRegisters(
     const struct SentryCrashMachineContext *const context);
 
-/** Add a thread to the reserved threads list.
- *
- * @param thread The thread to add to the list.
- */
-void sentrycrashmc_addReservedThread(SentryCrashThread thread);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/Tests/SentryTests/ClearTestState.swift b/Tests/SentryTests/ClearTestState.swift
index ac2f1958b51..4c0d19dfdbc 100644
--- a/Tests/SentryTests/ClearTestState.swift
+++ b/Tests/SentryTests/ClearTestState.swift
@@ -2,29 +2,35 @@ import Foundation
 import Sentry
 
 func clearTestState() {
-    SentrySDK.close()
-    SentrySDK.setCurrentHub(nil)
-    SentrySDK.crashedLastRunCalled = false
-    SentrySDK.startInvocations = 0
-    
-    PrivateSentrySDKOnly.onAppStartMeasurementAvailable = nil
-    PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode = false
-    SentrySDK.setAppStartMeasurement(nil)
-    CurrentDate.setCurrentDateProvider(nil)
-    SentryNetworkTracker.sharedInstance.disable()
-    
-    #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
-    let framesTracker = SentryFramesTracker.sharedInstance()
-    framesTracker.stop()
-    framesTracker.resetFrames()
-    
-    setenv("ActivePrewarm", "0", 1)
-    SentryAppStartTracker.load()
-    #endif
-    
-    SentryDependencyContainer.reset()
-    Dynamic(SentryGlobalEventProcessor.shared()).removeAllProcessors()
-    SentrySwizzleWrapper.sharedInstance.removeAllCallbacks()
-    
-    SentryNSDataTracker.sharedInstance.disable()
+    TestCleanup.clearTestState()
+}
+
+@objcMembers
+class TestCleanup: NSObject {
+    static func clearTestState() {
+        SentrySDK.close()
+        SentrySDK.setCurrentHub(nil)
+        SentrySDK.crashedLastRunCalled = false
+        SentrySDK.startInvocations = 0
+        PrivateSentrySDKOnly.onAppStartMeasurementAvailable = nil
+        PrivateSentrySDKOnly.appStartMeasurementHybridSDKMode = false
+        SentrySDK.setAppStartMeasurement(nil)
+        CurrentDate.setCurrentDateProvider(nil)
+        SentryNetworkTracker.sharedInstance.disable()
+
+        #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
+        let framesTracker = SentryFramesTracker.sharedInstance()
+        framesTracker.stop()
+        framesTracker.resetFrames()
+
+        setenv("ActivePrewarm", "0", 1)
+        SentryAppStartTracker.load()
+        #endif
+
+        SentryDependencyContainer.reset()
+        Dynamic(SentryGlobalEventProcessor.shared()).removeAllProcessors()
+        SentrySwizzleWrapper.sharedInstance.removeAllCallbacks()
+
+        SentryNSDataTracker.sharedInstance.disable()
+    }
 }
diff --git a/Tests/SentryTests/Helper/TestNSNotificationCenterWrapper.swift b/Tests/SentryTests/Helper/TestNSNotificationCenterWrapper.swift
index 2f1098980f1..1d9fc0e2f67 100644
--- a/Tests/SentryTests/Helper/TestNSNotificationCenterWrapper.swift
+++ b/Tests/SentryTests/Helper/TestNSNotificationCenterWrapper.swift
@@ -1,19 +1,22 @@
 import Foundation
 
-class TestNSNotificationCenterWrapper: SentryNSNotificationCenterWrapper {
-    
+@objc public class TestNSNotificationCenterWrapper: SentryNSNotificationCenterWrapper {
     var addObserverInvocations = Invocations<(observer: Any, selector: Selector, name: NSNotification.Name)>()
-    override func addObserver(_ observer: Any, selector aSelector: Selector, name aName: NSNotification.Name) {
+    @objc public var addObserverInvocationsCount: Int {
+        return addObserverInvocations.count
+    }
+
+    public override func addObserver(_ observer: Any, selector aSelector: Selector, name aName: NSNotification.Name) {
         addObserverInvocations.record((observer, aSelector, aName))
     }
-    
+
     var removeObserverWithNameInvocations = Invocations<(observer: Any, name: NSNotification.Name)>()
-    override func removeObserver(_ observer: Any, name aName: NSNotification.Name) {
+    public override func removeObserver(_ observer: Any, name aName: NSNotification.Name) {
         removeObserverWithNameInvocations.record((observer, aName))
     }
-    
+
     var removeObserverInvocations = Invocations<Any>()
-    override func removeObserver(_ observer: Any) {
+    public override func removeObserver(_ observer: Any) {
         removeObserverInvocations.record(observer)
     }
 }
diff --git a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift
index 58a05124ebf..d084ebd2df1 100644
--- a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift
+++ b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift
@@ -188,6 +188,34 @@ class SentryCoreDataTrackerTests: XCTestCase {
         XCTAssertEqual(updated["SecondTestEntity"] as? Int, 2)
     }
     
+    func test_Request_with_Error() {
+        let fetch = NSFetchRequest<TestEntity>(entityName: "TestEntity")
+        
+        let transaction = startTransaction()
+        let sut = fixture.getSut()
+        
+        let context = fixture.context
+        
+        let _ = try?  sut.fetchManagedObjectContext(context, request: fetch) { _, _ in
+            return nil
+        }
+        
+        XCTAssertEqual(transaction.children.count, 1)
+        XCTAssertEqual(transaction.children[0].status, .internalError)
+    }
+    
+    func test_save_with_Error() {
+        let transaction = startTransaction()
+        let sut = fixture.getSut()
+        fixture.context.inserted = [fixture.testEntity()]
+        try? sut.saveManagedObjectContext(fixture.context) { _ in
+            return false
+        }
+        
+        XCTAssertEqual(transaction.children.count, 1)
+        XCTAssertEqual(transaction.children[0].status, .internalError)
+    }
+    
     func test_Save_NoChanges() {
         let sut = fixture.getSut()
         
diff --git a/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerIntegrationTests.swift b/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerIntegrationTests.swift
index 1474f47021a..fc72d21656b 100644
--- a/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerIntegrationTests.swift
+++ b/Tests/SentryTests/Integrations/Performance/Network/SentryNetworkTrackerIntegrationTests.swift
@@ -264,6 +264,8 @@ class SentryNetworkTrackerIntegrationTests: XCTestCase {
     }
         
     private func startSDK() {
+        // Closing the SDK sets enabled to false
+        fixture.options.enabled = true
         SentrySDK.start(options: self.fixture.options)
     }
     
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
index dbb5bd2c850..b0cfb18b15b 100644
--- a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
+++ b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
@@ -202,14 +202,14 @@ class SentryCrashIntegrationTests: NotificationCenterTestCase {
         XCTAssertFalse(fixture.sentryCrash.installAsyncHooksCalled)
     }
 
-    func testUninstall_CallsClose() {
+    func testUninstall_CallsUninstallAsyncHooks() {
         let sut = fixture.getSut()
 
         sut.install(with: Options())
 
         sut.uninstall()
 
-        XCTAssertTrue(fixture.sentryCrash.closeCalled)
+        XCTAssertTrue(fixture.sentryCrash.uninstallAsyncHooksCalled)
     }
     
     func testUninstall_DoesNotUpdateLocale_OnLocaleDidChangeNotification() {
diff --git a/Tests/SentryTests/Protocol/SentryUserTests.swift b/Tests/SentryTests/Protocol/SentryUserTests.swift
index 00c7d37565d..ccc1afd857e 100644
--- a/Tests/SentryTests/Protocol/SentryUserTests.swift
+++ b/Tests/SentryTests/Protocol/SentryUserTests.swift
@@ -3,7 +3,7 @@ import XCTest
 class SentryUserTests: XCTestCase {
 
     func testSerializationWithAllProperties() {
-        let user = TestData.user.copy() as! SentryUser
+        let user = TestData.user.copy() as! User
         let actual = user.serialize()
 
         // Changing the original doesn't modify the serialized
@@ -23,7 +23,7 @@ class SentryUserTests: XCTestCase {
     }
     
     func testSerializationWithOnlyId() {
-        let user = SentryUser(userId: "someid")
+        let user = User(userId: "someid")
         let actual = user.serialize()
         
         XCTAssertEqual(user.userId, actual["id"] as? String)
@@ -31,7 +31,7 @@ class SentryUserTests: XCTestCase {
     }
 
     func testSerializationWithoutId() {
-        let user = SentryUser()
+        let user = User()
         let actual = user.serialize()
 
         XCTAssertNil(actual["id"] as? String)
@@ -55,7 +55,7 @@ class SentryUserTests: XCTestCase {
     }
     
     func testIsEqualToCopy() {
-        XCTAssertEqual(TestData.user, TestData.user.copy() as! SentryUser)
+        XCTAssertEqual(TestData.user, TestData.user.copy() as! User)
     }
     
     func testNotIsEqual() {
@@ -67,15 +67,15 @@ class SentryUserTests: XCTestCase {
         testIsNotEqual { user in user.data?.removeAll() }
     }
     
-    func testIsNotEqual(block: (SentryUser) -> Void ) {
-        let user = TestData.user.copy() as! SentryUser
+    func testIsNotEqual(block: (User) -> Void ) {
+        let user = TestData.user.copy() as! User
         block(user)
         XCTAssertNotEqual(TestData.user, user)
     }
     
     func testCopyWithZone_CopiesDeepCopy() {
         let user = TestData.user
-        let copiedUser = user.copy() as! SentryUser
+        let copiedUser = user.copy() as! User
         
         // Modifying the original does not change the copy
         user.userId = ""
@@ -95,7 +95,7 @@ class SentryUserTests: XCTestCase {
         let queue = DispatchQueue(label: "SentryScopeTests", qos: .userInteractive, attributes: [.concurrent, .initiallyInactive])
         let group = DispatchGroup()
         
-        let user = TestData.user.copy() as! SentryUser
+        let user = TestData.user.copy() as! User
         
         for i in 0...20 {
             group.enter()
diff --git a/Tests/SentryTests/Protocol/TestData.swift b/Tests/SentryTests/Protocol/TestData.swift
index db9dbd0c696..2a8f6893b91 100644
--- a/Tests/SentryTests/Protocol/TestData.swift
+++ b/Tests/SentryTests/Protocol/TestData.swift
@@ -55,8 +55,8 @@ class TestData {
         return event
     }
     
-    static var user: SentryUser {
-        let user = SentryUser(userId: "id")
+    static var user: User {
+        let user = User(userId: "id")
         user.email = "user@sentry.io"
         user.username = "user123"
         user.ipAddress = "127.0.0.1"
diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
index 8bff2abe1b1..a8565d305f4 100644
--- a/Tests/SentryTests/SentryClientTests.swift
+++ b/Tests/SentryTests/SentryClientTests.swift
@@ -21,7 +21,7 @@ class SentryClientTest: XCTestCase {
         let messageAsString = "message"
         let message: SentryMessage
         
-        let user: SentryUser
+        let user: User
         let fileManager: SentryFileManager
         let random = TestRandom(value: 1.0)
         
@@ -44,7 +44,7 @@ class SentryClientTest: XCTestCase {
             event = Event()
             event.message = message
             
-            user = SentryUser()
+            user = User()
             user.email = "someone@sentry.io"
             user.ipAddress = "127.0.0.1"
             
diff --git a/Tests/SentryTests/SentryCrash/SentryCrashInstallationTests.m b/Tests/SentryTests/SentryCrash/SentryCrashInstallationTests.m
new file mode 100644
index 00000000000..31916f58dfb
--- /dev/null
+++ b/Tests/SentryTests/SentryCrash/SentryCrashInstallationTests.m
@@ -0,0 +1,146 @@
+#import "SentryCrash.h"
+#import "SentryCrashCachedData.h"
+#import "SentryCrashInstallation+Private.h"
+#import "SentryCrashInstallation.h"
+#import "SentryCrashMonitor.h"
+#import "SentryCrashMonitor_MachException.h"
+#import "SentryNSNotificationCenterWrapper.h"
+#import "SentryTests-Swift.h"
+#import <XCTest/XCTest.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SentryCrashTestInstallation : SentryCrashInstallation
+
+@end
+
+@implementation SentryCrashTestInstallation
+
+- (instancetype)initForTesting
+{
+    if (self = [super initWithRequiredProperties:[NSArray new]]) { }
+    return self;
+}
+
+@end
+
+@interface SentryCrashInstallationTests : XCTestCase
+
+@property (nonatomic, strong) TestNSNotificationCenterWrapper *notificationCenter;
+
+@end
+
+@implementation SentryCrashInstallationTests
+
+- (SentryCrashTestInstallation *)getSut
+{
+    SentryCrashTestInstallation *installation =
+        [[SentryCrashTestInstallation alloc] initForTesting];
+    self.notificationCenter = [[TestNSNotificationCenterWrapper alloc] init];
+    [[SentryCrash sharedInstance] setSentryNSNotificationCenterWrapper:self.notificationCenter];
+    return installation;
+}
+
+- (void)testUninstall
+{
+    SentryCrashTestInstallation *installation = [self getSut];
+
+    [installation install];
+
+    SentryCrashMonitorType monitorsAfterInstall = [SentryCrash sharedInstance].monitoring;
+
+    [installation uninstall];
+
+    [self assertUninstalled:installation monitorsAfterInstall:monitorsAfterInstall];
+}
+
+- (void)testUninstall_CallsRemoveObservers
+{
+    SentryCrashTestInstallation *installation = [self getSut];
+
+    [installation install];
+    [installation uninstall];
+
+#if SentryCrashCRASH_HAS_UIAPPLICATION
+    XCTAssertEqual(5, self.notificationCenter.removeWithNotificationInvocationsCount);
+#endif
+}
+
+- (void)testUninstall_Install
+{
+    SentryCrashTestInstallation *installation = [self getSut];
+
+    [installation install];
+
+    SentryCrash *sentryCrash = [SentryCrash sharedInstance];
+    SentryCrashMonitorType monitorsAfterInstall = sentryCrash.monitoring;
+    CrashHandlerData *crashHandlerDataAfterInstall = [installation g_crashHandlerData];
+
+    // To ensure multiple calls in a row work
+    for (int i = 0; i < 10; i++) {
+        [installation uninstall];
+        [installation install];
+    }
+
+    [self assertReinstalled:installation
+                monitorsAfterInstall:monitorsAfterInstall
+        crashHandlerDataAfterInstall:crashHandlerDataAfterInstall];
+
+    [installation uninstall];
+    [self assertUninstalled:installation monitorsAfterInstall:monitorsAfterInstall];
+
+    [installation install];
+    [self assertReinstalled:installation
+                monitorsAfterInstall:monitorsAfterInstall
+        crashHandlerDataAfterInstall:crashHandlerDataAfterInstall];
+
+#if SentryCrashCRASH_HAS_UIAPPLICATION
+    XCTAssertEqual(55, self.notificationCenter.removeWithNotificationInvocationsCount);
+#endif
+}
+
+- (void)assertReinstalled:(SentryCrashTestInstallation *)installation
+            monitorsAfterInstall:(SentryCrashMonitorType)monitorsAfterInstall
+    crashHandlerDataAfterInstall:(CrashHandlerData *)crashHandlerDataAfterInstall
+{
+    SentryCrash *sentryCrash = [SentryCrash sharedInstance];
+    XCTAssertNotEqual(NULL, [installation g_crashHandlerData]);
+    XCTAssertEqual(monitorsAfterInstall, sentryCrash.monitoring);
+    XCTAssertEqual(monitorsAfterInstall, sentrycrashcm_getActiveMonitors());
+    XCTAssertNotEqual(NULL, sentryCrash.onCrash);
+    XCTAssertEqual(crashHandlerDataAfterInstall, [installation g_crashHandlerData]);
+    XCTAssertNotEqual(NULL, sentrycrashcm_getEventCallback());
+    XCTAssertTrue(sentrycrashccd_hasThreadStarted());
+
+    [self assertReservedThreads:monitorsAfterInstall];
+}
+
+- (void)assertUninstalled:(SentryCrashTestInstallation *)installation
+     monitorsAfterInstall:(SentryCrashMonitorType)monitorsAfterInstall
+{
+    SentryCrash *sentryCrash = [SentryCrash sharedInstance];
+    XCTAssertEqual(NULL, [installation g_crashHandlerData]);
+    XCTAssertEqual(SentryCrashMonitorTypeNone, sentryCrash.monitoring);
+    XCTAssertEqual(SentryCrashMonitorTypeNone, sentrycrashcm_getActiveMonitors());
+    XCTAssertEqual(NULL, sentryCrash.onCrash);
+    XCTAssertEqual(NULL, sentrycrashcm_getEventCallback());
+    XCTAssertFalse(sentrycrashccd_hasThreadStarted());
+
+    [self assertReservedThreads:monitorsAfterInstall];
+}
+
+/**
+ * SentryCrash only fills the reserved threads list if the mach exception monitor is enabled.
+ */
+- (void)assertReservedThreads:(SentryCrashMonitorType)monitorsAfterInstall
+{
+    if (monitorsAfterInstall & SentryCrashMonitorTypeMachException) {
+        XCTAssertTrue(sentrycrashcm_hasReservedThreads());
+    } else {
+        XCTAssertFalse(sentrycrashcm_hasReservedThreads());
+    }
+}
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Tests/SentryTests/SentryCrash/SentryCrashLogger_Tests.m b/Tests/SentryTests/SentryCrash/SentryCrashLogger_Tests.m
index 11e39b692e7..f3277efd71e 100644
--- a/Tests/SentryTests/SentryCrash/SentryCrashLogger_Tests.m
+++ b/Tests/SentryTests/SentryCrash/SentryCrashLogger_Tests.m
@@ -94,29 +94,4 @@ - (void)testLogBasicAlwaysNull
     SentryCrashLOGBASIC_ALWAYS(str);
 }
 
-- (void)testSetLogFilename
-{
-    NSString *expected = @"TEST";
-    NSString *logFileName = [self.tempDir stringByAppendingPathComponent:@"log.txt"];
-    sentrycrashlog_setLogFilename([logFileName UTF8String], true);
-    SentryCrashLOGBASIC_ALWAYS(expected);
-    sentrycrashlog_setLogFilename(nil, true);
-
-    NSError *error = nil;
-    NSString *result = [NSString stringWithContentsOfFile:logFileName
-                                                 encoding:NSUTF8StringEncoding
-                                                    error:&error];
-    XCTAssertNil(error, @"");
-    result = [[result componentsSeparatedByString:@"\x0a"] objectAtIndex:0];
-    XCTAssertEqualObjects(result, expected, @"");
-
-    SentryCrashLOGBASIC_ALWAYS(@"blah blah");
-    result = [NSString stringWithContentsOfFile:logFileName
-                                       encoding:NSUTF8StringEncoding
-                                          error:&error];
-    result = [[result componentsSeparatedByString:@"\x0a"] objectAtIndex:0];
-    XCTAssertNil(error, @"");
-    XCTAssertEqualObjects(result, expected, @"");
-}
-
 @end
diff --git a/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift b/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift
index 416a11ecf79..778002348c7 100644
--- a/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift
+++ b/Tests/SentryTests/SentryCrash/SentryThreadInspectorTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-    class SentryThreadInspectorTests: XCTestCase {
+class SentryThreadInspectorTests: XCTestCase {
     
     private class Fixture {
         var testMachineContextWrapper = TestMachineContextWrapper()
diff --git a/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.h b/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.h
index 4ca76a8bc63..052456cc023 100644
--- a/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.h
+++ b/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.h
@@ -25,7 +25,7 @@ SENTRY_NO_INIT
 
 @property (nonatomic, assign) BOOL installAsyncHooksCalled;
 
-@property (nonatomic, assign) BOOL closeCalled;
+@property (nonatomic, assign) BOOL uninstallAsyncHooksCalled;
 
 @property (nonatomic, assign) uint64_t internalFreeMemorySize;
 
diff --git a/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.m b/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.m
index 4c6d77345ee..5f8cac49d29 100644
--- a/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.m
+++ b/Tests/SentryTests/SentryCrash/TestSentryCrashWrapper.m
@@ -14,7 +14,7 @@ + (instancetype)sharedInstance
     instance.internalIsSimulatorBuild = NO;
     instance.internalIsApplicationInForeground = YES;
     instance.installAsyncHooksCalled = NO;
-    instance.closeCalled = NO;
+    instance.uninstallAsyncHooksCalled = NO;
     instance.internalFreeMemorySize = 0;
     instance.internalAppMemorySize = 0;
     instance.internalFreeStorageSize = 0;
@@ -56,9 +56,9 @@ - (void)installAsyncHooks
     self.installAsyncHooksCalled = YES;
 }
 
-- (void)close
+- (void)uninstallAsyncHooks
 {
-    self.closeCalled = YES;
+    self.uninstallAsyncHooksCalled = YES;
 }
 
 - (NSDictionary *)systemInfo
diff --git a/Tests/SentryTests/SentryHubTests.swift b/Tests/SentryTests/SentryHubTests.swift
index 8a965892060..864318b4e85 100644
--- a/Tests/SentryTests/SentryHubTests.swift
+++ b/Tests/SentryTests/SentryHubTests.swift
@@ -180,7 +180,7 @@ class SentryHubTests: XCTestCase {
         let client = SentryClient(options: fixture.options)
         let hub = SentryHub(client: client, andScope: Scope())
 
-        let user = SentryUser()
+        let user = User()
         user.userId = "123"
         hub.setUser(user)
 
diff --git a/Tests/SentryTests/SentryScopeSwiftTests.swift b/Tests/SentryTests/SentryScopeSwiftTests.swift
index a359a05191f..7327ee45ddf 100644
--- a/Tests/SentryTests/SentryScopeSwiftTests.swift
+++ b/Tests/SentryTests/SentryScopeSwiftTests.swift
@@ -3,7 +3,7 @@ import XCTest
 class SentryScopeSwiftTests: XCTestCase {
 
     private class Fixture {
-        let user: SentryUser
+        let user: User
         let breadcrumb: Breadcrumb
         let scope: Scope
         let date: Date
@@ -25,7 +25,7 @@ class SentryScopeSwiftTests: XCTestCase {
         init() {
             date = Date(timeIntervalSince1970: 10)
             
-            user = SentryUser(userId: "id")
+            user = User(userId: "id")
             user.email = "user@sentry.io"
             user.username = "user123"
             user.ipAddress = ipAddress
@@ -85,7 +85,7 @@ class SentryScopeSwiftTests: XCTestCase {
         scope.setTag(value: "another", key: "another")
         scope.setExtra(value: "another", key: "another")
         scope.setContext(value: ["": 1], key: "another")
-        scope.setUser(SentryUser())
+        scope.setUser(User())
         scope.setDist("")
         scope.setEnvironment("")
         scope.setFingerprint([])
@@ -558,8 +558,8 @@ class SentryScopeSwiftTests: XCTestCase {
             clearInvocations += 1
         }
         
-        var user: SentryUser?
-        func setUser(_ user: SentryUser?) {
+        var user: User?
+        func setUser(_ user: User?) {
             self.user = user
         }
     }
diff --git a/Tests/SentryTests/SentrySessionTests.swift b/Tests/SentryTests/SentrySessionTests.swift
index e4910e18aba..f17ecbfa598 100644
--- a/Tests/SentryTests/SentrySessionTests.swift
+++ b/Tests/SentryTests/SentrySessionTests.swift
@@ -38,7 +38,7 @@ class SentrySessionTestsSwift: XCTestCase {
     }
 
     func testCopySession() {
-        let user = SentryUser()
+        let user = User()
         user.email = "someone@sentry.io"
 
         let session = SentrySession(releaseName: "1.0.0")
diff --git a/Tests/SentryTests/Transaction/SentryTraceStateTests.swift b/Tests/SentryTests/Transaction/SentryTraceStateTests.swift
index abee88a5692..4ca24cdbb33 100644
--- a/Tests/SentryTests/Transaction/SentryTraceStateTests.swift
+++ b/Tests/SentryTests/Transaction/SentryTraceStateTests.swift
@@ -28,7 +28,7 @@ class SentryTraceContextTests: XCTestCase {
             tracer = SentryTracer(transactionContext: TransactionContext(name: transactionName, operation: transactionOperation), hub: nil)
             
             scope = Scope()
-            scope.setUser(SentryUser(userId: userId))
+            scope.setUser(User(userId: userId))
             scope.userObject?.segment = userSegment
             scope.span = tracer