diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 83c3f5351..1706361fd 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -343,7 +343,6 @@
 		A157076117F0CD6D007C2BD6 /* RtpPacketTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A157070D17F0CD6D007C2BD6 /* RtpPacketTests.m */; };
 		A157076217F0CD6D007C2BD6 /* SecureStreamTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157071017F0CD6D007C2BD6 /* SecureStreamTest.m */; };
 		A157076317F0CD6D007C2BD6 /* SequenceCounterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157071217F0CD6D007C2BD6 /* SequenceCounterTest.m */; };
-		A157076417F0CD6D007C2BD6 /* DH3KAgreerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157071517F0CD6D007C2BD6 /* DH3KAgreerTest.m */; };
 		A157076517F0CD6D007C2BD6 /* HandshakePacketTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157071717F0CD6D007C2BD6 /* HandshakePacketTest.m */; };
 		A157076617F0CD6D007C2BD6 /* HashChainTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157071917F0CD6D007C2BD6 /* HashChainTest.m */; };
 		A157076717F0CD6D007C2BD6 /* MasterSecretTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A157071B17F0CD6D007C2BD6 /* MasterSecretTest.m */; };
@@ -1010,65 +1009,39 @@
 		76EB053F18170B33006006FC /* CallLogTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CallLogTableViewCell.xib; sourceTree = "<group>"; };
 		8313AE91B4954215858A5662 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		A15706EC17F0CD6D007C2BD6 /* AsyncUtilTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncUtilTest.h; sourceTree = "<group>"; };
 		A15706ED17F0CD6D007C2BD6 /* AsyncUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AsyncUtilTest.m; sourceTree = "<group>"; };
-		A15706EE17F0CD6D007C2BD6 /* FutureSourceTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FutureSourceTest.h; sourceTree = "<group>"; };
 		A15706EF17F0CD6D007C2BD6 /* FutureSourceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FutureSourceTest.m; sourceTree = "<group>"; };
-		A15706F017F0CD6D007C2BD6 /* ObservableTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObservableTest.h; sourceTree = "<group>"; };
 		A15706F117F0CD6D007C2BD6 /* ObservableTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObservableTest.m; sourceTree = "<group>"; };
-		A15706F317F0CD6D007C2BD6 /* AudioFrameTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioFrameTest.h; sourceTree = "<group>"; };
 		A15706F417F0CD6D007C2BD6 /* AudioFrameTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioFrameTest.m; sourceTree = "<group>"; };
-		A15706F517F0CD6D007C2BD6 /* AudioRemoteIOTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioRemoteIOTest.h; sourceTree = "<group>"; };
 		A15706F617F0CD6D007C2BD6 /* AudioRemoteIOTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioRemoteIOTest.m; sourceTree = "<group>"; };
-		A15706F717F0CD6D007C2BD6 /* AudioStretcherTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioStretcherTest.h; sourceTree = "<group>"; };
 		A15706F817F0CD6D007C2BD6 /* AudioStretcherTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioStretcherTest.m; sourceTree = "<group>"; };
-		A15706F917F0CD6D007C2BD6 /* JitterQueueTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JitterQueueTest.h; sourceTree = "<group>"; };
 		A15706FA17F0CD6D007C2BD6 /* JitterQueueTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JitterQueueTest.m; sourceTree = "<group>"; };
-		A15706FB17F0CD6D007C2BD6 /* SpeexCodecTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeexCodecTest.h; sourceTree = "<group>"; };
 		A15706FC17F0CD6D007C2BD6 /* SpeexCodecTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpeexCodecTest.m; sourceTree = "<group>"; };
-		A157070217F0CD6D007C2BD6 /* DnsManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DnsManagerTest.h; sourceTree = "<group>"; };
 		A157070317F0CD6D007C2BD6 /* DnsManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DnsManagerTest.m; sourceTree = "<group>"; };
 		A157070517F0CD6D007C2BD6 /* HttpRequestResponseTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpRequestResponseTest.h; sourceTree = "<group>"; };
 		A157070617F0CD6D007C2BD6 /* HttpRequestResponseTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpRequestResponseTest.m; sourceTree = "<group>"; };
-		A157070717F0CD6D007C2BD6 /* IpAddressTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IpAddressTest.h; sourceTree = "<group>"; };
 		A157070817F0CD6D007C2BD6 /* IpAddressTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IpAddressTest.m; sourceTree = "<group>"; };
-		A157070917F0CD6D007C2BD6 /* IpEndPointTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IpEndPointTest.h; sourceTree = "<group>"; };
 		A157070A17F0CD6D007C2BD6 /* IpEndPointTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IpEndPointTest.m; sourceTree = "<group>"; };
-		A157070C17F0CD6D007C2BD6 /* RtpPacketTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RtpPacketTests.h; sourceTree = "<group>"; };
 		A157070D17F0CD6D007C2BD6 /* RtpPacketTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RtpPacketTests.m; sourceTree = "<group>"; };
-		A157070F17F0CD6D007C2BD6 /* SecureStreamTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecureStreamTest.h; sourceTree = "<group>"; };
 		A157071017F0CD6D007C2BD6 /* SecureStreamTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecureStreamTest.m; sourceTree = "<group>"; };
-		A157071117F0CD6D007C2BD6 /* SequenceCounterTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SequenceCounterTest.h; sourceTree = "<group>"; };
 		A157071217F0CD6D007C2BD6 /* SequenceCounterTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SequenceCounterTest.m; sourceTree = "<group>"; };
-		A157071417F0CD6D007C2BD6 /* DH3KAgreerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DH3KAgreerTest.h; sourceTree = "<group>"; };
-		A157071517F0CD6D007C2BD6 /* DH3KAgreerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DH3KAgreerTest.m; sourceTree = "<group>"; };
-		A157071617F0CD6D007C2BD6 /* HandshakePacketTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HandshakePacketTest.h; sourceTree = "<group>"; };
 		A157071717F0CD6D007C2BD6 /* HandshakePacketTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HandshakePacketTest.m; sourceTree = "<group>"; };
-		A157071817F0CD6D007C2BD6 /* HashChainTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashChainTest.h; sourceTree = "<group>"; };
 		A157071917F0CD6D007C2BD6 /* HashChainTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashChainTest.m; sourceTree = "<group>"; };
-		A157071A17F0CD6D007C2BD6 /* MasterSecretTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MasterSecretTest.h; sourceTree = "<group>"; };
 		A157071B17F0CD6D007C2BD6 /* MasterSecretTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MasterSecretTest.m; sourceTree = "<group>"; };
-		A157071C17F0CD6D007C2BD6 /* ShortAuthenticationStringGeneratorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShortAuthenticationStringGeneratorTest.h; sourceTree = "<group>"; };
 		A157071D17F0CD6D007C2BD6 /* ShortAuthenticationStringGeneratorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShortAuthenticationStringGeneratorTest.m; sourceTree = "<group>"; };
 		A157071F17F0CD6D007C2BD6 /* PregeneratedKeyAgreementParticipantProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PregeneratedKeyAgreementParticipantProtocol.h; sourceTree = "<group>"; };
 		A157072017F0CD6D007C2BD6 /* PregeneratedKeyAgreementParticipantProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PregeneratedKeyAgreementParticipantProtocol.m; sourceTree = "<group>"; };
 		A157072117F0CD6D007C2BD6 /* ZrtpTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZrtpTest.h; sourceTree = "<group>"; };
 		A157072217F0CD6D007C2BD6 /* ZrtpTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZrtpTest.m; sourceTree = "<group>"; };
-		A157072417F0CD6D007C2BD6 /* LowLatencyConnectorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LowLatencyConnectorTest.h; sourceTree = "<group>"; };
 		A157072517F0CD6D007C2BD6 /* LowLatencyConnectorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LowLatencyConnectorTest.m; sourceTree = "<group>"; };
-		A157072717F0CD6D007C2BD6 /* NetworkStreamTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkStreamTest.h; sourceTree = "<group>"; };
 		A157072817F0CD6D007C2BD6 /* NetworkStreamTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkStreamTest.m; sourceTree = "<group>"; };
-		A157072917F0CD6D007C2BD6 /* SecureEndPointTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecureEndPointTest.h; sourceTree = "<group>"; };
 		A157072A17F0CD6D007C2BD6 /* SecureEndPointTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecureEndPointTest.m; sourceTree = "<group>"; };
 		A157072C17F0CD6D007C2BD6 /* UdpSocketTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UdpSocketTest.h; sourceTree = "<group>"; };
 		A157072D17F0CD6D007C2BD6 /* UdpSocketTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UdpSocketTest.m; sourceTree = "<group>"; };
-		A157072F17F0CD6D007C2BD6 /* PhoneNumberTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhoneNumberTest.h; sourceTree = "<group>"; };
 		A157073017F0CD6D007C2BD6 /* PhoneNumberTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhoneNumberTest.m; sourceTree = "<group>"; };
 		A157073217F0CD6D007C2BD6 /* SessionDescriptorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionDescriptorTest.h; sourceTree = "<group>"; };
 		A157073317F0CD6D007C2BD6 /* SessionDescriptorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SessionDescriptorTest.m; sourceTree = "<group>"; };
-		A157073517F0CD6D007C2BD6 /* DecayingSampleEstimatorTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecayingSampleEstimatorTest.h; sourceTree = "<group>"; };
 		A157073617F0CD6D007C2BD6 /* DecayingSampleEstimatorTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DecayingSampleEstimatorTest.m; sourceTree = "<group>"; };
-		A157073717F0CD6D007C2BD6 /* EventWindowTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventWindowTest.h; sourceTree = "<group>"; };
 		A157073817F0CD6D007C2BD6 /* EventWindowTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EventWindowTest.m; sourceTree = "<group>"; };
 		A157073A17F0CD6D007C2BD6 /* SignalTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SignalTests-Info.plist"; sourceTree = "<group>"; };
 		A157073B17F0CD6D007C2BD6 /* TestUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestUtil.h; sourceTree = "<group>"; };
@@ -2233,11 +2206,8 @@
 		A15706EB17F0CD6D007C2BD6 /* async */ = {
 			isa = PBXGroup;
 			children = (
-				A15706EC17F0CD6D007C2BD6 /* AsyncUtilTest.h */,
 				A15706ED17F0CD6D007C2BD6 /* AsyncUtilTest.m */,
-				A15706EE17F0CD6D007C2BD6 /* FutureSourceTest.h */,
 				A15706EF17F0CD6D007C2BD6 /* FutureSourceTest.m */,
-				A15706F017F0CD6D007C2BD6 /* ObservableTest.h */,
 				A15706F117F0CD6D007C2BD6 /* ObservableTest.m */,
 			);
 			path = async;
@@ -2246,15 +2216,10 @@
 		A15706F217F0CD6D007C2BD6 /* audio */ = {
 			isa = PBXGroup;
 			children = (
-				A15706F317F0CD6D007C2BD6 /* AudioFrameTest.h */,
 				A15706F417F0CD6D007C2BD6 /* AudioFrameTest.m */,
-				A15706F517F0CD6D007C2BD6 /* AudioRemoteIOTest.h */,
 				A15706F617F0CD6D007C2BD6 /* AudioRemoteIOTest.m */,
-				A15706F717F0CD6D007C2BD6 /* AudioStretcherTest.h */,
 				A15706F817F0CD6D007C2BD6 /* AudioStretcherTest.m */,
-				A15706F917F0CD6D007C2BD6 /* JitterQueueTest.h */,
 				A15706FA17F0CD6D007C2BD6 /* JitterQueueTest.m */,
-				A15706FB17F0CD6D007C2BD6 /* SpeexCodecTest.h */,
 				A15706FC17F0CD6D007C2BD6 /* SpeexCodecTest.m */,
 			);
 			path = audio;
@@ -2265,9 +2230,7 @@
 			children = (
 				A157070117F0CD6D007C2BD6 /* dns */,
 				A157070417F0CD6D007C2BD6 /* http */,
-				A157070717F0CD6D007C2BD6 /* IpAddressTest.h */,
 				A157070817F0CD6D007C2BD6 /* IpAddressTest.m */,
-				A157070917F0CD6D007C2BD6 /* IpEndPointTest.h */,
 				A157070A17F0CD6D007C2BD6 /* IpEndPointTest.m */,
 				A157070B17F0CD6D007C2BD6 /* rtp */,
 				A157072317F0CD6D007C2BD6 /* tcp */,
@@ -2279,7 +2242,6 @@
 		A157070117F0CD6D007C2BD6 /* dns */ = {
 			isa = PBXGroup;
 			children = (
-				A157070217F0CD6D007C2BD6 /* DnsManagerTest.h */,
 				A157070317F0CD6D007C2BD6 /* DnsManagerTest.m */,
 			);
 			path = dns;
@@ -2297,7 +2259,6 @@
 		A157070B17F0CD6D007C2BD6 /* rtp */ = {
 			isa = PBXGroup;
 			children = (
-				A157070C17F0CD6D007C2BD6 /* RtpPacketTests.h */,
 				A157070D17F0CD6D007C2BD6 /* RtpPacketTests.m */,
 				A157070E17F0CD6D007C2BD6 /* srtp */,
 				A157071317F0CD6D007C2BD6 /* zrtp */,
@@ -2308,9 +2269,7 @@
 		A157070E17F0CD6D007C2BD6 /* srtp */ = {
 			isa = PBXGroup;
 			children = (
-				A157070F17F0CD6D007C2BD6 /* SecureStreamTest.h */,
 				A157071017F0CD6D007C2BD6 /* SecureStreamTest.m */,
-				A157071117F0CD6D007C2BD6 /* SequenceCounterTest.h */,
 				A157071217F0CD6D007C2BD6 /* SequenceCounterTest.m */,
 			);
 			path = srtp;
@@ -2319,15 +2278,9 @@
 		A157071317F0CD6D007C2BD6 /* zrtp */ = {
 			isa = PBXGroup;
 			children = (
-				A157071417F0CD6D007C2BD6 /* DH3KAgreerTest.h */,
-				A157071517F0CD6D007C2BD6 /* DH3KAgreerTest.m */,
-				A157071617F0CD6D007C2BD6 /* HandshakePacketTest.h */,
 				A157071717F0CD6D007C2BD6 /* HandshakePacketTest.m */,
-				A157071817F0CD6D007C2BD6 /* HashChainTest.h */,
 				A157071917F0CD6D007C2BD6 /* HashChainTest.m */,
-				A157071A17F0CD6D007C2BD6 /* MasterSecretTest.h */,
 				A157071B17F0CD6D007C2BD6 /* MasterSecretTest.m */,
-				A157071C17F0CD6D007C2BD6 /* ShortAuthenticationStringGeneratorTest.h */,
 				A157071D17F0CD6D007C2BD6 /* ShortAuthenticationStringGeneratorTest.m */,
 				A157071E17F0CD6D007C2BD6 /* utilities */,
 				A157072117F0CD6D007C2BD6 /* ZrtpTest.h */,
@@ -2349,7 +2302,6 @@
 		A157072317F0CD6D007C2BD6 /* tcp */ = {
 			isa = PBXGroup;
 			children = (
-				A157072417F0CD6D007C2BD6 /* LowLatencyConnectorTest.h */,
 				A157072517F0CD6D007C2BD6 /* LowLatencyConnectorTest.m */,
 				A157072617F0CD6D007C2BD6 /* tls */,
 			);
@@ -2359,9 +2311,7 @@
 		A157072617F0CD6D007C2BD6 /* tls */ = {
 			isa = PBXGroup;
 			children = (
-				A157072717F0CD6D007C2BD6 /* NetworkStreamTest.h */,
 				A157072817F0CD6D007C2BD6 /* NetworkStreamTest.m */,
-				A157072917F0CD6D007C2BD6 /* SecureEndPointTest.h */,
 				A157072A17F0CD6D007C2BD6 /* SecureEndPointTest.m */,
 			);
 			path = tls;
@@ -2379,7 +2329,6 @@
 		A157072E17F0CD6D007C2BD6 /* phone */ = {
 			isa = PBXGroup;
 			children = (
-				A157072F17F0CD6D007C2BD6 /* PhoneNumberTest.h */,
 				A157073017F0CD6D007C2BD6 /* PhoneNumberTest.m */,
 				A157073117F0CD6D007C2BD6 /* signaling */,
 			);
@@ -2398,9 +2347,7 @@
 		A157073417F0CD6D007C2BD6 /* profiling */ = {
 			isa = PBXGroup;
 			children = (
-				A157073517F0CD6D007C2BD6 /* DecayingSampleEstimatorTest.h */,
 				A157073617F0CD6D007C2BD6 /* DecayingSampleEstimatorTest.m */,
-				A157073717F0CD6D007C2BD6 /* EventWindowTest.h */,
 				A157073817F0CD6D007C2BD6 /* EventWindowTest.m */,
 			);
 			path = profiling;
@@ -3299,7 +3246,6 @@
 				76EB063B18170B33006006FC /* FunctionalUtil.m in Sources */,
 				A157076217F0CD6D007C2BD6 /* SecureStreamTest.m in Sources */,
 				A157076317F0CD6D007C2BD6 /* SequenceCounterTest.m in Sources */,
-				A157076417F0CD6D007C2BD6 /* DH3KAgreerTest.m in Sources */,
 				76EB062318170B33006006FC /* CyclicalBuffer.m in Sources */,
 				A157076517F0CD6D007C2BD6 /* HandshakePacketTest.m in Sources */,
 				76EB054918170B33006006FC /* CancelTokenSource.m in Sources */,
@@ -3533,7 +3479,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C71793B33D9C45079F74487E /* Pods.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 1;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3573,7 +3519,7 @@
 				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_NAME = Signal;
-				PROVISIONING_PROFILE = "B26CF658-AD7F-4F4C-B94F-74884941DF87";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_AFTER_BUILD = YES;
@@ -3770,7 +3716,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C71793B33D9C45079F74487E /* Pods.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 1;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3822,7 +3768,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C71793B33D9C45079F74487E /* Pods.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 1;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3857,7 +3803,7 @@
 				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_NAME = Signal;
-				PROVISIONING_PROFILE = "7214A823-1F7A-4460-82D8-D89CA511CEA6";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_AFTER_BUILD = YES;
diff --git a/Signal/test/async/AsyncUtilTest.h b/Signal/test/async/AsyncUtilTest.h
deleted file mode 100644
index e368891b5..000000000
--- a/Signal/test/async/AsyncUtilTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface AsyncUtilTest : XCTestCase
-
-@end
diff --git a/Signal/test/async/AsyncUtilTest.m b/Signal/test/async/AsyncUtilTest.m
index 9054ded33..524dc19f6 100644
--- a/Signal/test/async/AsyncUtilTest.m
+++ b/Signal/test/async/AsyncUtilTest.m
@@ -1,4 +1,4 @@
-#import "AsyncUtilTest.h"
+#import <XCTest/XCTest.h>
 #import "TestUtil.h"
 #import "AsyncUtil.h"
 #import "FutureSource.h"
@@ -6,6 +6,10 @@
 #import "CancelledToken.h"
 #import "ThreadManager.h"
 
+@interface AsyncUtilTest : XCTestCase
+
+@end
+
 @implementation AsyncUtilTest
 
 -(void) testRaceCancellableOperations_Winner {
diff --git a/Signal/test/async/FutureSourceTest.h b/Signal/test/async/FutureSourceTest.h
deleted file mode 100644
index 0843ed791..000000000
--- a/Signal/test/async/FutureSourceTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface FutureSourceTest : XCTestCase
-
-@end
diff --git a/Signal/test/async/FutureSourceTest.m b/Signal/test/async/FutureSourceTest.m
index dcd31c7be..6c71fafdc 100644
--- a/Signal/test/async/FutureSourceTest.m
+++ b/Signal/test/async/FutureSourceTest.m
@@ -1,8 +1,12 @@
-#import "FutureSourceTest.h"
+#import <XCTest/XCTest.h>
 #import "TestUtil.h"
 #import "FutureSource.h"
 #import "Util.h"
 
+@interface FutureSourceTest:XCTestCase
+
+@end
+
 @implementation FutureSourceTest
 
 -(void) testConstructors {
diff --git a/Signal/test/async/ObservableTest.h b/Signal/test/async/ObservableTest.h
deleted file mode 100644
index 6690477fc..000000000
--- a/Signal/test/async/ObservableTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface ObservableTest : XCTestCase
-
-@end
diff --git a/Signal/test/async/ObservableTest.m b/Signal/test/async/ObservableTest.m
index 0e334a8a9..a0c54c881 100644
--- a/Signal/test/async/ObservableTest.m
+++ b/Signal/test/async/ObservableTest.m
@@ -1,8 +1,12 @@
-#import "ObservableTest.h"
+#import <XCTest/XCTest.h>
 #import "ObservableValue.h"
 #import "TestUtil.h"
 #import "CancelTokenSource.h"
 
+@interface ObservableTest : XCTestCase
+
+@end
+
 @implementation ObservableTest
 
 -(void) testObservableAddRemove {
diff --git a/Signal/test/audio/AudioFrameTest.h b/Signal/test/audio/AudioFrameTest.h
deleted file mode 100644
index 90d6c9b70..000000000
--- a/Signal/test/audio/AudioFrameTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface AudioFrameTest : XCTestCase
-
-@end
diff --git a/Signal/test/audio/AudioFrameTest.m b/Signal/test/audio/AudioFrameTest.m
index f3503f357..d16e318a9 100644
--- a/Signal/test/audio/AudioFrameTest.m
+++ b/Signal/test/audio/AudioFrameTest.m
@@ -1,7 +1,11 @@
-#import "AudioFrameTest.h"
+#import <XCTest/XCTest.h>
 #import "EncodedAudioPacket.h"
 #import "TestUtil.h"
 
+@interface AudioFrameTest : XCTestCase
+
+@end
+
 @implementation AudioFrameTest
 -(void) testTrivial {
     NSData* d2 = [NSMutableData dataWithLength:6];
diff --git a/Signal/test/audio/AudioRemoteIOTest.h b/Signal/test/audio/AudioRemoteIOTest.h
deleted file mode 100644
index e032f3943..000000000
--- a/Signal/test/audio/AudioRemoteIOTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface AudioRemoteIOTest : XCTestCase
-
-@end
diff --git a/Signal/test/audio/AudioRemoteIOTest.m b/Signal/test/audio/AudioRemoteIOTest.m
index 71db7a75a..46a130370 100644
--- a/Signal/test/audio/AudioRemoteIOTest.m
+++ b/Signal/test/audio/AudioRemoteIOTest.m
@@ -1,9 +1,13 @@
-#import "AudioRemoteIOTest.h"
+#import <XCTest/XCTest.h>
 #import "RemoteIOAudio.h"
 #import "AnonymousAudioCallbackHandler.h"
 #import "TestUtil.h"
 #import "CancelTokenSource.h"
 
+@interface AudioRemoteIOTest : XCTestCase
+
+@end
+
 @implementation AudioRemoteIOTest
 
 -(void) ______REMOVE_THIS_PREFIX_TO_ENABLE_ACTUAL_AUDIO_TEST______testPlaysAndRecordsAudio {
diff --git a/Signal/test/audio/AudioStretcherTest.h b/Signal/test/audio/AudioStretcherTest.h
deleted file mode 100644
index 9be2d7731..000000000
--- a/Signal/test/audio/AudioStretcherTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface AudioStretcherTest : XCTestCase
-
-@end
diff --git a/Signal/test/audio/AudioStretcherTest.m b/Signal/test/audio/AudioStretcherTest.m
index 50cf84489..17ca0e979 100644
--- a/Signal/test/audio/AudioStretcherTest.m
+++ b/Signal/test/audio/AudioStretcherTest.m
@@ -1,7 +1,11 @@
-#import "AudioStretcherTest.h"
+#import <XCTest/XCTest.h>
 #import "TestUtil.h"
 #import "AudioStretcher.h"
 
+@interface AudioStretcherTest : XCTestCase
+
+@end
+
 @implementation AudioStretcherTest
 -(void) testStretchAudioStretches {
     for (NSNumber* s in @[@0.5, @1.0, @1.5]) {
diff --git a/Signal/test/audio/JitterQueueTest.h b/Signal/test/audio/JitterQueueTest.h
deleted file mode 100644
index d749245f5..000000000
--- a/Signal/test/audio/JitterQueueTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface JitterQueueTest : XCTestCase
-
-@end
diff --git a/Signal/test/audio/JitterQueueTest.m b/Signal/test/audio/JitterQueueTest.m
index be5780c44..b0223f09c 100644
--- a/Signal/test/audio/JitterQueueTest.m
+++ b/Signal/test/audio/JitterQueueTest.m
@@ -1,4 +1,4 @@
-#import "JitterQueueTest.h"
+#import <XCTest/XCTest.h>
 #import "JitterQueue.h"
 #import "TestUtil.h"
 #import "EncodedAudioPacket.h"
@@ -15,6 +15,10 @@
 #define testLoggedDiscard(q, sequenceNumber, oldReadHeadSequenceNumber, newReadHeadSequenceNumber) testLogged(q, ([NSString stringWithFormat:@"discard %d,%d,%d", sequenceNumber, oldReadHeadSequenceNumber, newReadHeadSequenceNumber]))
 #define testLoggedResync(q, oldReadHeadSequenceNumber, newReadHeadSequenceNumber) testLogged(q, ([NSString stringWithFormat:@"resync %d to %d", oldReadHeadSequenceNumber,newReadHeadSequenceNumber]))
 
+@interface JitterQueueTest : XCTestCase
+
+@end
+
 @implementation JitterQueueTest
 
 -(void) testJitterStartsFromAnyIndex {
diff --git a/Signal/test/audio/SpeexCodecTest.h b/Signal/test/audio/SpeexCodecTest.h
deleted file mode 100644
index a56692ca9..000000000
--- a/Signal/test/audio/SpeexCodecTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface SpeexCodecTest : XCTestCase
-
-@end
diff --git a/Signal/test/audio/SpeexCodecTest.m b/Signal/test/audio/SpeexCodecTest.m
index 915828c06..59d14c5e2 100644
--- a/Signal/test/audio/SpeexCodecTest.m
+++ b/Signal/test/audio/SpeexCodecTest.m
@@ -1,8 +1,12 @@
-#import "SpeexCodecTest.h"
+#import <XCTest/XCTest.h>
 #import "SpeexCodec.h"
 #import "TestUtil.h"
 #import "Util.h"
 
+@interface SpeexCodecTest : XCTestCase
+
+@end
+
 @implementation SpeexCodecTest
 -(void) testSpeexConstantBitRate {
     NSMutableData* x1 = [NSMutableData dataWithLength:320];
diff --git a/Signal/test/network/IpAddressTest.h b/Signal/test/network/IpAddressTest.h
deleted file mode 100644
index a42286d42..000000000
--- a/Signal/test/network/IpAddressTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface IpAddressTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/IpAddressTest.m b/Signal/test/network/IpAddressTest.m
index 88db391c0..39785835b 100644
--- a/Signal/test/network/IpAddressTest.m
+++ b/Signal/test/network/IpAddressTest.m
@@ -1,7 +1,11 @@
-#import "IpAddressTest.h"
+#import <XCTest/XCTest.h>
 #import "TestUtil.h"
 #import "IpAddress.h"
 
+@interface IpAddressTest : XCTestCase
+
+@end
+
 @implementation IpAddressTest
 -(void) testFromString {
     testThrows([IpAddress ipAddressFromString:nil]);
diff --git a/Signal/test/network/IpEndPointTest.h b/Signal/test/network/IpEndPointTest.h
deleted file mode 100644
index 9acbbad8c..000000000
--- a/Signal/test/network/IpEndPointTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface IpEndPointTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/IpEndPointTest.m b/Signal/test/network/IpEndPointTest.m
index 0a5692f07..d59d7cc64 100644
--- a/Signal/test/network/IpEndPointTest.m
+++ b/Signal/test/network/IpEndPointTest.m
@@ -1,8 +1,12 @@
-#import "IpEndPointTest.h"
+#import <XCTest/XCTest.h>
 #import "TestUtil.h"
 #import "IpEndPoint.h"
 #import "IpAddress.h"
 
+@interface IpEndPointTest : XCTestCase
+
+@end
+
 @implementation IpEndPointTest
 -(void) testTrivial {
     IpAddress* a = [IpAddress localhost];
diff --git a/Signal/test/network/dns/DnsManagerTest.h b/Signal/test/network/dns/DnsManagerTest.h
deleted file mode 100644
index 70049edc6..000000000
--- a/Signal/test/network/dns/DnsManagerTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface DnsManagerTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/dns/DnsManagerTest.m b/Signal/test/network/dns/DnsManagerTest.m
index 6149bc9ef..38dcfd8ed 100644
--- a/Signal/test/network/dns/DnsManagerTest.m
+++ b/Signal/test/network/dns/DnsManagerTest.m
@@ -1,4 +1,4 @@
-#import "DnsManagerTest.h"
+#import <XCTest/XCTest.h>
 #import "DnsManager.h"
 #import "TestUtil.h"
 #import "Util.h"
@@ -13,6 +13,10 @@
 #define nonExistentHostname [NSString stringWithFormat:@"%@kfurmtludehntlgihmvnduyebntiinvbudydepqowudyfnrkt.com", \
     [[CryptoTools generateSecureRandomData:10] encodedAsBase64]]
 
+@interface DnsManagerTest : XCTestCase
+
+@end
+
 @implementation DnsManagerTest
 
 -(void) testQueryAddresses_Sequential {
diff --git a/Signal/test/network/rtp/RtpPacketTests.h b/Signal/test/network/rtp/RtpPacketTests.h
deleted file mode 100644
index 23cbca2bc..000000000
--- a/Signal/test/network/rtp/RtpPacketTests.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#import <XCTest/XCTest.h>
-#import "RtpPacket.h"
-
-@interface RtpPacketTests : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/RtpPacketTests.m b/Signal/test/network/rtp/RtpPacketTests.m
index ffb323337..4195d0aac 100644
--- a/Signal/test/network/rtp/RtpPacketTests.m
+++ b/Signal/test/network/rtp/RtpPacketTests.m
@@ -1,7 +1,11 @@
-#import "RtpPacketTests.h"
+#import <XCTest/XCTest.h>
 #import "TestUtil.h"
 #import "Util.h"
 
+@interface RtpPacketTests : XCTestCase
+
+@end
+
 @implementation RtpPacketTests
 
 -(void) testRawDataSimple {
diff --git a/Signal/test/network/rtp/srtp/SecureStreamTest.h b/Signal/test/network/rtp/srtp/SecureStreamTest.h
deleted file mode 100644
index 43d03a50d..000000000
--- a/Signal/test/network/rtp/srtp/SecureStreamTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface SecureStreamTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/srtp/SecureStreamTest.m b/Signal/test/network/rtp/srtp/SecureStreamTest.m
index 74b5d13ef..a52f748aa 100644
--- a/Signal/test/network/rtp/srtp/SecureStreamTest.m
+++ b/Signal/test/network/rtp/srtp/SecureStreamTest.m
@@ -1,8 +1,12 @@
-#import "SecureStreamTest.h"
+#import <XCTest/XCTest.h>
 #import "SrtpStream.h"
 #import "Util.h"
 #import "TestUtil.h"
 
+@interface SecureStreamTest : XCTestCase
+
+@end
+
 @implementation SecureStreamTest
 -(void) testPerturbedRoundTrip {
     for (int repeat = 0; repeat < 10; repeat++) {
diff --git a/Signal/test/network/rtp/srtp/SequenceCounterTest.h b/Signal/test/network/rtp/srtp/SequenceCounterTest.h
deleted file mode 100644
index c162853fe..000000000
--- a/Signal/test/network/rtp/srtp/SequenceCounterTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface SequenceCounterTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/srtp/SequenceCounterTest.m b/Signal/test/network/rtp/srtp/SequenceCounterTest.m
index 2d1f461c1..2d9d7698f 100644
--- a/Signal/test/network/rtp/srtp/SequenceCounterTest.m
+++ b/Signal/test/network/rtp/srtp/SequenceCounterTest.m
@@ -1,7 +1,11 @@
-#import "SequenceCounterTest.h"
+#import <XCTest/XCTest.h>
 #import "SequenceCounter.h"
 #import "TestUtil.h"
 
+@interface SequenceCounterTest : XCTestCase
+
+@end
+
 @implementation SequenceCounterTest
 -(void)testCountingForwards {
     SequenceCounter* s = [SequenceCounter sequenceCounter];
diff --git a/Signal/test/network/rtp/zrtp/DH3KAgreerTest.h b/Signal/test/network/rtp/zrtp/DH3KAgreerTest.h
deleted file mode 100644
index 72362b180..000000000
--- a/Signal/test/network/rtp/zrtp/DH3KAgreerTest.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  DH3KAgreerTest.h
-//  RedPhone
-//
-//  Created by Twisted Oak Studios Mac Mini on 2013-03-21.
-//  Copyright (c) 2013 Twisted Oak Studios. All rights reserved.
-//
-
-#import <XCTest/XCTest.h>
-
-@interface DH3KAgreerTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/zrtp/DH3KAgreerTest.m b/Signal/test/network/rtp/zrtp/DH3KAgreerTest.m
deleted file mode 100644
index 942e3a0c8..000000000
--- a/Signal/test/network/rtp/zrtp/DH3KAgreerTest.m
+++ /dev/null
@@ -1,10 +0,0 @@
-#import "DH3KAgreerTest.h"
-#import "DH3KKeyAgreementProtocol.h"
-#import "DH3KKeyAgreementParticipant.h"
-#import "Conversions.h"
-#import "CryptoTools.h"
-#import "Util.h"
-#import "TestUtil.h"
-
-@implementation DH3KAgreerTest
-@end
diff --git a/Signal/test/network/rtp/zrtp/HandshakePacketTest.h b/Signal/test/network/rtp/zrtp/HandshakePacketTest.h
deleted file mode 100644
index a605b31f9..000000000
--- a/Signal/test/network/rtp/zrtp/HandshakePacketTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface HandshakePacketTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/zrtp/HandshakePacketTest.m b/Signal/test/network/rtp/zrtp/HandshakePacketTest.m
index 3f35efb34..04d91f74e 100644
--- a/Signal/test/network/rtp/zrtp/HandshakePacketTest.m
+++ b/Signal/test/network/rtp/zrtp/HandshakePacketTest.m
@@ -1,9 +1,13 @@
-#import "HandshakePacketTest.h"
+#import <XCTest/XCTest.h>
 #import "HelloPacket.h"
 #import "TestUtil.h"
 #import "Util.h"
 #import "Crc32.h"
 
+@interface HandshakePacketTest : XCTestCase
+
+@end
+
 @implementation HandshakePacketTest
 -(void) testHelloPacket {
     [Environment setCurrent:testEnv];
diff --git a/Signal/test/network/rtp/zrtp/HashChainTest.h b/Signal/test/network/rtp/zrtp/HashChainTest.h
deleted file mode 100644
index 9eecdc0bb..000000000
--- a/Signal/test/network/rtp/zrtp/HashChainTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface HashChainTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/zrtp/HashChainTest.m b/Signal/test/network/rtp/zrtp/HashChainTest.m
index ac134e928..fe5c3f015 100644
--- a/Signal/test/network/rtp/zrtp/HashChainTest.m
+++ b/Signal/test/network/rtp/zrtp/HashChainTest.m
@@ -1,9 +1,13 @@
-#import "HashChainTest.h"
+#import <XCTest/XCTest.h>
 #import "HashChain.h"
 #import "Util.h"
 #import "CryptoTools.h"
 #import "TestUtil.h"
 
+@interface HashChainTest : XCTestCase
+
+@end
+
 @implementation HashChainTest
 -(void) testHashChainKnown {
     testThrows([HashChain hashChainWithSeed:nil]);
diff --git a/Signal/test/network/rtp/zrtp/MasterSecretTest.h b/Signal/test/network/rtp/zrtp/MasterSecretTest.h
deleted file mode 100644
index 889231ebc..000000000
--- a/Signal/test/network/rtp/zrtp/MasterSecretTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface MasterSecretTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/zrtp/MasterSecretTest.m b/Signal/test/network/rtp/zrtp/MasterSecretTest.m
index 1c6d681d6..81694f90d 100644
--- a/Signal/test/network/rtp/zrtp/MasterSecretTest.m
+++ b/Signal/test/network/rtp/zrtp/MasterSecretTest.m
@@ -1,8 +1,12 @@
-#import "MasterSecretTest.h"
+#import <XCTest/XCTest.h>
 #import "MasterSecret.h"
 #import "Util.h"
 #import "TestUtil.h"
 
+@interface MasterSecretTest : XCTestCase
+
+@end
+
 @implementation MasterSecretTest
 -(void) testKnownCalculateSharedSecret {
     NSData* dhResult = [NSMutableData dataWithLength:384];
diff --git a/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.h b/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.h
deleted file mode 100644
index 05ccee8a8..000000000
--- a/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface ShortAuthenticationStringGeneratorTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.m b/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.m
index 9ea788d8e..8b3ea6be4 100644
--- a/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.m
+++ b/Signal/test/network/rtp/zrtp/ShortAuthenticationStringGeneratorTest.m
@@ -1,8 +1,12 @@
-#import "ShortAuthenticationStringGeneratorTest.h"
+#import <XCTest/XCTest.h>
 #import "ShortAuthenticationStringGenerator.h"
 #import "Util.h"
 #import "TestUtil.h"
 
+@interface ShortAuthenticationStringGeneratorTest : XCTestCase
+
+@end
+
 @implementation ShortAuthenticationStringGeneratorTest
 -(void) testSAS {
     test([[ShortAuthenticationStringGenerator generateFromData:[(@[@0,@0]) toUint8Data]] isEqualToString:@"aardvark adroitness"]);
diff --git a/Signal/test/network/tcp/LowLatencyConnectorTest.h b/Signal/test/network/tcp/LowLatencyConnectorTest.h
deleted file mode 100644
index 3353f7c01..000000000
--- a/Signal/test/network/tcp/LowLatencyConnectorTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface LowLatencyConnectorTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/tcp/LowLatencyConnectorTest.m b/Signal/test/network/tcp/LowLatencyConnectorTest.m
index 50f8821ae..241b0edf2 100644
--- a/Signal/test/network/tcp/LowLatencyConnectorTest.m
+++ b/Signal/test/network/tcp/LowLatencyConnectorTest.m
@@ -1,4 +1,4 @@
-#import "LowLatencyConnectorTest.h"
+#import <XCTest/XCTest.h>
 #import "LowLatencyConnector.h"
 #import "NetworkStream.h"
 #import "Util.h"
@@ -8,6 +8,10 @@
 #import "CancelledToken.h"
 #import "ThreadManager.h"
 
+@interface LowLatencyConnectorTest : XCTestCase
+
+@end
+
 @implementation LowLatencyConnectorTest
 
 -(void) testLowLatencyConnect_example {
diff --git a/Signal/test/network/tcp/tls/NetworkStreamTest.h b/Signal/test/network/tcp/tls/NetworkStreamTest.h
deleted file mode 100644
index 3e3abf749..000000000
--- a/Signal/test/network/tcp/tls/NetworkStreamTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface NetworkStreamTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/tcp/tls/NetworkStreamTest.m b/Signal/test/network/tcp/tls/NetworkStreamTest.m
index 4e9d075ea..b0a3e26f0 100644
--- a/Signal/test/network/tcp/tls/NetworkStreamTest.m
+++ b/Signal/test/network/tcp/tls/NetworkStreamTest.m
@@ -1,4 +1,4 @@
-#import "NetworkStreamTest.h"
+#import <XCTest/XCTest.h>
 #import "NetworkStream.h"
 #import "TestUtil.h"
 #import "Util.h"
@@ -15,6 +15,10 @@
 #define TEST_SERVER_INCORRECT_CERT_PATH @"whisperTest"
 #define TEST_SERVER_INCORRECT_CERT_TYPE @"der"
 
+@interface NetworkStreamTest : XCTestCase
+
+@end
+
 @implementation NetworkStreamTest
 
 -(void) testReplies {
diff --git a/Signal/test/network/tcp/tls/SecureEndPointTest.h b/Signal/test/network/tcp/tls/SecureEndPointTest.h
deleted file mode 100644
index cd0606d5f..000000000
--- a/Signal/test/network/tcp/tls/SecureEndPointTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface SecureEndPointTest : XCTestCase
-
-@end
diff --git a/Signal/test/network/tcp/tls/SecureEndPointTest.m b/Signal/test/network/tcp/tls/SecureEndPointTest.m
index d3237afc0..e6aecad70 100644
--- a/Signal/test/network/tcp/tls/SecureEndPointTest.m
+++ b/Signal/test/network/tcp/tls/SecureEndPointTest.m
@@ -1,8 +1,12 @@
-#import "SecureEndPointTest.h"
+#import <XCTest/XCTest.h>
 #import "SecureEndPoint.h"
 #import "TestUtil.h"
 #import "IpEndPoint.h"
 
+@interface SecureEndPointTest : XCTestCase
+
+@end
+
 @implementation SecureEndPointTest
 
 -(void) testCert {
diff --git a/Signal/test/phone/PhoneNumberTest.h b/Signal/test/phone/PhoneNumberTest.h
deleted file mode 100644
index a37777c94..000000000
--- a/Signal/test/phone/PhoneNumberTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface PhoneNumberTest : XCTestCase
-
-@end
diff --git a/Signal/test/phone/PhoneNumberTest.m b/Signal/test/phone/PhoneNumberTest.m
index a22b4011b..7c2ef7ff4 100644
--- a/Signal/test/phone/PhoneNumberTest.m
+++ b/Signal/test/phone/PhoneNumberTest.m
@@ -1,7 +1,11 @@
-#import "PhoneNumberTest.h"
+#import <XCTest/XCTest.h>
 #import "TestUtil.h"
 #import "PhoneNumber.h"
 
+@interface PhoneNumberTest : XCTestCase
+
+@end
+
 @implementation PhoneNumberTest
 
 -(void) testE164 {
diff --git a/Signal/test/phone/signaling/SessionDescriptorTest.m b/Signal/test/phone/signaling/SessionDescriptorTest.m
index 772fa0a29..7057995a6 100644
--- a/Signal/test/phone/signaling/SessionDescriptorTest.m
+++ b/Signal/test/phone/signaling/SessionDescriptorTest.m
@@ -34,8 +34,8 @@
                                    };
     
     [Environment setCurrent:testEnv];
-    [[Environment preferences] setValueForKey:@"Signaling Mac Key" toValue:[@"0000000000000000000000000000000000000000" decodedAsHexString]];
-    [[Environment preferences] setValueForKey:@"Signaling Cipher Key" toValue:[@"00000000000000000000000000000000" decodedAsHexString]];
+    [[[Environment getCurrent] preferences] setValueForKey:@"Signaling Mac Key" toValue:[@"0000000000000000000000000000000000000000" decodedAsHexString]];
+    [[[Environment getCurrent]preferences] setValueForKey:@"Signaling Cipher Key" toValue:[@"00000000000000000000000000000000" decodedAsHexString]];
     
     ResponderSessionDescriptor* d = [ResponderSessionDescriptor responderSessionDescriptorFromEncryptedRemoteNotification:notification];
   
diff --git a/Signal/test/profiling/DecayingSampleEstimatorTest.h b/Signal/test/profiling/DecayingSampleEstimatorTest.h
deleted file mode 100644
index a19dcc45e..000000000
--- a/Signal/test/profiling/DecayingSampleEstimatorTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface DecayingSampleEstimatorTest : XCTestCase
-
-@end
diff --git a/Signal/test/profiling/DecayingSampleEstimatorTest.m b/Signal/test/profiling/DecayingSampleEstimatorTest.m
index 69928249c..440a6cacd 100644
--- a/Signal/test/profiling/DecayingSampleEstimatorTest.m
+++ b/Signal/test/profiling/DecayingSampleEstimatorTest.m
@@ -1,7 +1,11 @@
-#import "DecayingSampleEstimatorTest.h"
+#import <XCTest/XCTest.h>
 #import "DecayingSampleEstimator.h"
 #import "TestUtil.h"
 
+@interface DecayingSampleEstimatorTest : XCTestCase
+
+@end
+
 @implementation DecayingSampleEstimatorTest
 -(void) testDecayingSampleEstimator {
     DecayingSampleEstimator* e = [DecayingSampleEstimator decayingSampleEstimatorWithInitialEstimate:1.0 andDecayPerUnitSample:0.5];
diff --git a/Signal/test/profiling/EventWindowTest.h b/Signal/test/profiling/EventWindowTest.h
deleted file mode 100644
index 4f49c1f40..000000000
--- a/Signal/test/profiling/EventWindowTest.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#import <XCTest/XCTest.h>
-
-@interface EventWindowTest : XCTestCase
-
-@end
diff --git a/Signal/test/profiling/EventWindowTest.m b/Signal/test/profiling/EventWindowTest.m
index b3954906f..1d6a0cff5 100644
--- a/Signal/test/profiling/EventWindowTest.m
+++ b/Signal/test/profiling/EventWindowTest.m
@@ -1,7 +1,11 @@
-#import "EventWindowTest.h"
+#import <XCTest/XCTest.h>
 #import "EventWindow.h"
 #import "TestUtil.h"
 
+@interface EventWindowTest : XCTestCase
+
+@end
+
 @implementation EventWindowTest
 -(void) testEventWindow {
     EventWindow* w = [EventWindow eventWindowWithWindowDuration:5];