diff --git a/Source/santad/SNTExecutionControllerTest.m b/Source/santad/SNTExecutionControllerTest.m
index 86a6f730d..bf376bdea 100644
--- a/Source/santad/SNTExecutionControllerTest.m
+++ b/Source/santad/SNTExecutionControllerTest.m
@@ -87,16 +87,6 @@ - (santa_vnode_id_t)getVnodeId {
   return (santa_vnode_id_t){.fsid = 1234, .fileid = 5678};
 }
 
-- (void)tearDown {
-  [self.mockFileInfo stopMocking];
-  [self.mockCodesignChecker stopMocking];
-  [self.mockDriverManager stopMocking];
-  [self.mockRuleDatabase stopMocking];
-  [self.mockEventDatabase stopMocking];
-
-  [super tearDown];
-}
-
 - (void)testBinaryAllowRule {
   OCMStub([self.mockFileInfo isMachO]).andReturn(YES);
   OCMStub([self.mockFileInfo SHA256]).andReturn(@"a");
diff --git a/Source/santametricservice/Formats/SNTMetricRawJSONFormat.m b/Source/santametricservice/Formats/SNTMetricRawJSONFormat.m
index d1190a313..339ccd38f 100644
--- a/Source/santametricservice/Formats/SNTMetricRawJSONFormat.m
+++ b/Source/santametricservice/Formats/SNTMetricRawJSONFormat.m
@@ -23,7 +23,8 @@ - (instancetype)init {
   self = [super init];
   if (self) {
     _dateFormatter = [[NSDateFormatter alloc] init];
-    [_dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"];
+    _dateFormatter.dateFormat = @"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+    _dateFormatter.timeZone = [NSTimeZone timeZoneForSecondsFromGMT:0];
   }
   return self;
 }
diff --git a/Source/santametricservice/Writers/SNTMetricHTTPWriterTest.m b/Source/santametricservice/Writers/SNTMetricHTTPWriterTest.m
index 1805d7cd9..eb54e401e 100644
--- a/Source/santametricservice/Writers/SNTMetricHTTPWriterTest.m
+++ b/Source/santametricservice/Writers/SNTMetricHTTPWriterTest.m
@@ -52,12 +52,6 @@ - (void)setUp {
     .andReturn(self.mockSessionDataTask);
 }
 
-- (void)tearDown {
-  [self.mockSessionDataTask stopMocking];
-  [self.mockSession stopMocking];
-  [self.mockMOLAuthenticatingURLSession stopMocking];
-}
-
 /// enqueues a mock HTTP response for testing.
 - (void)createMockResponseWithURL:(NSURL *)url
                          withCode:(NSInteger)code