diff --git a/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m b/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m
index afbb157d5..056ffd175 100644
--- a/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m
+++ b/Signal/src/Models/OWSMessagesBubblesSizeCalculator.m
@@ -100,7 +100,7 @@ NS_ASSUME_NONNULL_BEGIN
         TSInteraction *interaction = ((OWSCall *)messageData).interaction;
         return [self sizeForSystemMessage:interaction cacheKey:cacheKey layout:layout];
     } else {
-        // Ignore unknown message types; the tests use mocks.
+        OWSFail(@"Can't size unknown message data type: %@", [messageData class]);
     }
 
     // BEGIN HACK iOS10EmojiBug see: https://github.com/WhisperSystems/Signal-iOS/issues/1368
diff --git a/Signal/test/ViewControllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m b/Signal/test/ViewControllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m
index 5fc46aab4..4cf143938 100644
--- a/Signal/test/ViewControllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m
+++ b/Signal/test/ViewControllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m
@@ -102,8 +102,8 @@
 - (void)testCanPerformEditingActionWithVideoMessage
 {
     TSAttachmentStream *videoAttachment =
-    [[TSAttachmentStream alloc] initWithContentType:@"video/mp4" sourceFilename:nil];
-    [videoAttachment save];
+        [[TSAttachmentStream alloc] initWithContentType:@"video/mp4" sourceFilename:nil];
+
     self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:videoAttachment incoming:NO];
 
     XCTAssertTrue([self.messageAdapter canPerformEditingAction:@selector(delete:)]);
@@ -118,7 +118,6 @@
 {
     TSAttachmentStream *audioAttachment =
         [[TSAttachmentStream alloc] initWithContentType:@"audio/mp3" sourceFilename:nil];
-    [audioAttachment save];
     self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:audioAttachment incoming:NO];
 
     XCTAssertTrue([self.messageAdapter canPerformEditingAction:@selector(delete:)]);
@@ -254,7 +253,6 @@
     TSAttachmentStream *videoAttachment =
         [[TSAttachmentStream alloc] initWithContentType:@"video/mp4" sourceFilename:nil];
     [videoAttachment writeData:self.fakeVideoData error:&error];
-    [videoAttachment save];
     self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:videoAttachment incoming:YES];
 
     [self.messageAdapter performEditingAction:@selector(copy:)];
@@ -272,7 +270,6 @@
     TSAttachmentStream *audioAttachment =
         [[TSAttachmentStream alloc] initWithContentType:@"audio/mp3" sourceFilename:nil];
     [audioAttachment writeData:self.fakeAudioData error:&error];
-    [audioAttachment save];
     self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:audioAttachment incoming:NO];
 
     [self.messageAdapter performEditingAction:@selector(copy:)];
@@ -288,7 +285,6 @@
     TSAttachmentStream *audioAttachment =
         [[TSAttachmentStream alloc] initWithContentType:@"audio/x-m4a" sourceFilename:nil];
     [audioAttachment writeData:self.fakeAudioData error:&error];
-    [audioAttachment save];
     self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:audioAttachment incoming:NO];
 
     [self.messageAdapter performEditingAction:@selector(copy:)];
@@ -304,7 +300,6 @@
     TSAttachmentStream *audioAttachment =
         [[TSAttachmentStream alloc] initWithContentType:@"audio/wav" sourceFilename:nil];
     [audioAttachment writeData:self.fakeAudioData error:&error];
-    [audioAttachment save];
     self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:audioAttachment incoming:NO];
 
     [self.messageAdapter performEditingAction:@selector(copy:)];
diff --git a/Signal/test/contact/ContactsPickerTest.swift b/Signal/test/contact/ContactsPickerTest.swift
index a9d682983..4fd677e43 100644
--- a/Signal/test/contact/ContactsPickerTest.swift
+++ b/Signal/test/contact/ContactsPickerTest.swift
@@ -5,7 +5,6 @@
 import XCTest
 import Contacts
 @testable import Signal
-import Contacts
 
 final class ContactsPickerTest: XCTestCase {
     private var prevLang: Any?