diff --git a/ASDKListKit/Podfile b/ASDKListKit/Podfile
deleted file mode 100644
index 788a72989..000000000
--- a/ASDKListKit/Podfile
+++ /dev/null
@@ -1,9 +0,0 @@
-source 'https://github.com/CocoaPods/Specs.git'
-
-platform :ios, '8.0'
-target 'ASDKListKitTests' do
-	pod 'Texture/IGListKit', :path => '..'
-	pod 'IGListKit', :git => 'https://github.com/Instagram/IGListKit', :commit => '357a28e'
-	pod 'JGMethodSwizzler', :git => 'https://github.com/JonasGessner/JGMethodSwizzler', :branch => 'master'
-end
-
diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj
index 53ab65437..51f5e6d31 100644
--- a/AsyncDisplayKit.xcodeproj/project.pbxproj
+++ b/AsyncDisplayKit.xcodeproj/project.pbxproj
@@ -326,7 +326,6 @@
 		CC11F97A1DB181180024D77B /* ASNetworkImageNodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CC11F9791DB181180024D77B /* ASNetworkImageNodeTests.m */; };
 		CC2F65EE1E5FFB1600DA57C9 /* ASMutableElementMap.h in Headers */ = {isa = PBXBuildFile; fileRef = CC2F65EC1E5FFB1600DA57C9 /* ASMutableElementMap.h */; };
 		CC2F65EF1E5FFB1600DA57C9 /* ASMutableElementMap.m in Sources */ = {isa = PBXBuildFile; fileRef = CC2F65ED1E5FFB1600DA57C9 /* ASMutableElementMap.m */; };
-		CC311E071EEF81C400A8D7A6 /* ASDisplayNode+OCMock.m in Sources */ = {isa = PBXBuildFile; fileRef = CC311E061EEF81C400A8D7A6 /* ASDisplayNode+OCMock.m */; };
 		CC3B20841C3F76D600798563 /* ASPendingStateController.h in Headers */ = {isa = PBXBuildFile; fileRef = CC3B20811C3F76D600798563 /* ASPendingStateController.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CC3B20861C3F76D600798563 /* ASPendingStateController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CC3B20821C3F76D600798563 /* ASPendingStateController.mm */; };
 		CC3B208A1C3F7A5400798563 /* ASWeakSet.h in Headers */ = {isa = PBXBuildFile; fileRef = CC3B20871C3F7A5400798563 /* ASWeakSet.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -344,6 +343,10 @@
 		CC55A7121E52A0F200594372 /* ASResponderChainEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = CC55A7101E52A0F200594372 /* ASResponderChainEnumerator.m */; };
 		CC57EAF71E3939350034C595 /* ASCollectionView+Undeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = CC2E317F1DAC353700EEE891 /* ASCollectionView+Undeprecated.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CC57EAF81E3939450034C595 /* ASTableView+Undeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = CC512B841DAC45C60054848E /* ASTableView+Undeprecated.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		CC583AD61EF9BDBE00134156 /* ASTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CC583AC21EF9BAB400134156 /* ASTestCase.m */; };
+		CC583AD71EF9BDC100134156 /* NSInvocation+ASTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = CC583AC51EF9BAB400134156 /* NSInvocation+ASTestHelpers.m */; };
+		CC583AD81EF9BDC300134156 /* OCMockObject+ASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CC583AC71EF9BAB400134156 /* OCMockObject+ASAdditions.m */; };
+		CC583AD91EF9BDC600134156 /* ASDisplayNode+OCMock.m in Sources */ = {isa = PBXBuildFile; fileRef = CC583AC01EF9BAB400134156 /* ASDisplayNode+OCMock.m */; };
 		CC58AA4B1E398E1D002C8CB4 /* ASBlockTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = CC58AA4A1E398E1D002C8CB4 /* ASBlockTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CC6AA2DA1E9F03B900978E87 /* ASDisplayNode+Ancestry.h in Headers */ = {isa = PBXBuildFile; fileRef = CC6AA2D81E9F03B900978E87 /* ASDisplayNode+Ancestry.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CC6AA2DB1E9F03B900978E87 /* ASDisplayNode+Ancestry.m in Sources */ = {isa = PBXBuildFile; fileRef = CC6AA2D91E9F03B900978E87 /* ASDisplayNode+Ancestry.m */; };
@@ -370,11 +373,8 @@
 		CCA282CD1E9EB73E0037E8B7 /* ASTipNode.m in Sources */ = {isa = PBXBuildFile; fileRef = CCA282CB1E9EB73E0037E8B7 /* ASTipNode.m */; };
 		CCA282D01E9EBF6C0037E8B7 /* ASTipsWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = CCA282CE1E9EBF6C0037E8B7 /* ASTipsWindow.h */; };
 		CCA282D11E9EBF6C0037E8B7 /* ASTipsWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CCA282CF1E9EBF6C0037E8B7 /* ASTipsWindow.m */; };
-		CCA5F62C1EEC9E9B0060C137 /* NSInvocation+ASTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = CCA5F62B1EEC9E9B0060C137 /* NSInvocation+ASTestHelpers.m */; };
 		CCA5F62E1EECC2A80060C137 /* ASAssert.m in Sources */ = {isa = PBXBuildFile; fileRef = CCA5F62D1EECC2A80060C137 /* ASAssert.m */; };
 		CCB2F34D1D63CCC6004E6DE9 /* ASDisplayNodeSnapshotTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB2F34C1D63CCC6004E6DE9 /* ASDisplayNodeSnapshotTests.m */; };
-		CCB338E41EEE11160081F21A /* OCMockObject+ASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB338E31EEE11160081F21A /* OCMockObject+ASAdditions.m */; };
-		CCB338E71EEE27760081F21A /* ASTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB338E61EEE27760081F21A /* ASTestCase.m */; };
 		CCBBBF5D1EB161760069AA91 /* ASRangeManagingNode.h in Headers */ = {isa = PBXBuildFile; fileRef = CCBBBF5C1EB161760069AA91 /* ASRangeManagingNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CCCCCCD51EC3EF060087FE10 /* ASTextDebugOption.h in Headers */ = {isa = PBXBuildFile; fileRef = CCCCCCC31EC3EF060087FE10 /* ASTextDebugOption.h */; };
 		CCCCCCD61EC3EF060087FE10 /* ASTextDebugOption.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCCCCC41EC3EF060087FE10 /* ASTextDebugOption.m */; };
@@ -662,7 +662,6 @@
 		698DFF461E36B7E9002891F1 /* ASLayoutSpecUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASLayoutSpecUtilities.h; sourceTree = "<group>"; };
 		699B83501E3C1BA500433FA4 /* ASLayoutSpecTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASLayoutSpecTests.m; sourceTree = "<group>"; };
 		69B225661D72535E00B25B22 /* ASDisplayNodeLayoutTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASDisplayNodeLayoutTests.mm; sourceTree = "<group>"; };
-		69B225681D7265DA00B25B22 /* ASXCTExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASXCTExtensions.h; sourceTree = "<group>"; };
 		69BCE3D71EC6513B007DCCAD /* ASDisplayNode+Layout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "ASDisplayNode+Layout.mm"; sourceTree = "<group>"; };
 		69CB62A91CB8165900024920 /* _ASDisplayViewAccessiblity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _ASDisplayViewAccessiblity.h; sourceTree = "<group>"; };
 		69CB62AA1CB8165900024920 /* _ASDisplayViewAccessiblity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _ASDisplayViewAccessiblity.mm; sourceTree = "<group>"; };
@@ -785,7 +784,6 @@
 		CC2E317F1DAC353700EEE891 /* ASCollectionView+Undeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASCollectionView+Undeprecated.h"; sourceTree = "<group>"; };
 		CC2F65EC1E5FFB1600DA57C9 /* ASMutableElementMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMutableElementMap.h; sourceTree = "<group>"; };
 		CC2F65ED1E5FFB1600DA57C9 /* ASMutableElementMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASMutableElementMap.m; sourceTree = "<group>"; };
-		CC311E061EEF81C400A8D7A6 /* ASDisplayNode+OCMock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ASDisplayNode+OCMock.m"; sourceTree = "<group>"; };
 		CC3B20811C3F76D600798563 /* ASPendingStateController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASPendingStateController.h; sourceTree = "<group>"; };
 		CC3B20821C3F76D600798563 /* ASPendingStateController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASPendingStateController.mm; sourceTree = "<group>"; };
 		CC3B20871C3F7A5400798563 /* ASWeakSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASWeakSet.h; sourceTree = "<group>"; };
@@ -805,6 +803,14 @@
 		CC55A70F1E52A0F200594372 /* ASResponderChainEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASResponderChainEnumerator.h; sourceTree = "<group>"; };
 		CC55A7101E52A0F200594372 /* ASResponderChainEnumerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASResponderChainEnumerator.m; sourceTree = "<group>"; };
 		CC57EAF91E394EA40034C595 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		CC583AC01EF9BAB400134156 /* ASDisplayNode+OCMock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ASDisplayNode+OCMock.m"; sourceTree = "<group>"; };
+		CC583AC11EF9BAB400134156 /* ASTestCase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASTestCase.h; sourceTree = "<group>"; };
+		CC583AC21EF9BAB400134156 /* ASTestCase.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASTestCase.m; sourceTree = "<group>"; };
+		CC583AC31EF9BAB400134156 /* ASXCTExtensions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASXCTExtensions.h; sourceTree = "<group>"; };
+		CC583AC41EF9BAB400134156 /* NSInvocation+ASTestHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSInvocation+ASTestHelpers.h"; sourceTree = "<group>"; };
+		CC583AC51EF9BAB400134156 /* NSInvocation+ASTestHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSInvocation+ASTestHelpers.m"; sourceTree = "<group>"; };
+		CC583AC61EF9BAB400134156 /* OCMockObject+ASAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMockObject+ASAdditions.h"; sourceTree = "<group>"; };
+		CC583AC71EF9BAB400134156 /* OCMockObject+ASAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "OCMockObject+ASAdditions.m"; sourceTree = "<group>"; };
 		CC58AA4A1E398E1D002C8CB4 /* ASBlockTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBlockTypes.h; sourceTree = "<group>"; };
 		CC6AA2D81E9F03B900978E87 /* ASDisplayNode+Ancestry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ASDisplayNode+Ancestry.h"; path = "Base/ASDisplayNode+Ancestry.h"; sourceTree = "<group>"; };
 		CC6AA2D91E9F03B900978E87 /* ASDisplayNode+Ancestry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "ASDisplayNode+Ancestry.m"; path = "Base/ASDisplayNode+Ancestry.m"; sourceTree = "<group>"; };
@@ -832,14 +838,8 @@
 		CCA282CB1E9EB73E0037E8B7 /* ASTipNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTipNode.m; sourceTree = "<group>"; };
 		CCA282CE1E9EBF6C0037E8B7 /* ASTipsWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTipsWindow.h; sourceTree = "<group>"; };
 		CCA282CF1E9EBF6C0037E8B7 /* ASTipsWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTipsWindow.m; sourceTree = "<group>"; };
-		CCA5F62A1EEC9E9B0060C137 /* NSInvocation+ASTestHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSInvocation+ASTestHelpers.h"; sourceTree = "<group>"; };
-		CCA5F62B1EEC9E9B0060C137 /* NSInvocation+ASTestHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSInvocation+ASTestHelpers.m"; sourceTree = "<group>"; };
 		CCA5F62D1EECC2A80060C137 /* ASAssert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASAssert.m; sourceTree = "<group>"; };
 		CCB2F34C1D63CCC6004E6DE9 /* ASDisplayNodeSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASDisplayNodeSnapshotTests.m; sourceTree = "<group>"; };
-		CCB338E21EEE11160081F21A /* OCMockObject+ASAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OCMockObject+ASAdditions.h"; sourceTree = "<group>"; };
-		CCB338E31EEE11160081F21A /* OCMockObject+ASAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OCMockObject+ASAdditions.m"; sourceTree = "<group>"; };
-		CCB338E51EEE27760081F21A /* ASTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTestCase.h; sourceTree = "<group>"; };
-		CCB338E61EEE27760081F21A /* ASTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTestCase.m; sourceTree = "<group>"; };
 		CCBBBF5C1EB161760069AA91 /* ASRangeManagingNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASRangeManagingNode.h; sourceTree = "<group>"; };
 		CCBD05DE1E4147B000D18509 /* ASIGListAdapterBasedDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASIGListAdapterBasedDataSource.m; sourceTree = "<group>"; };
 		CCBD05DF1E4147B000D18509 /* ASIGListAdapterBasedDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASIGListAdapterBasedDataSource.h; sourceTree = "<group>"; };
@@ -1119,13 +1119,7 @@
 		058D09C5195D04C000B7D73C /* Tests */ = {
 			isa = PBXGroup;
 			children = (
-				CC311E061EEF81C400A8D7A6 /* ASDisplayNode+OCMock.m */,
-				CCB338E51EEE27760081F21A /* ASTestCase.h */,
-				CCB338E61EEE27760081F21A /* ASTestCase.m */,
-				CCB338E21EEE11160081F21A /* OCMockObject+ASAdditions.h */,
-				CCB338E31EEE11160081F21A /* OCMockObject+ASAdditions.m */,
-				CCA5F62A1EEC9E9B0060C137 /* NSInvocation+ASTestHelpers.h */,
-				CCA5F62B1EEC9E9B0060C137 /* NSInvocation+ASTestHelpers.m */,
+				CC583ABF1EF9BAB400134156 /* Common */,
 				CCDD148A1EEDCD9D0020834E /* ASCollectionModernDataSourceTests.m */,
 				CC034A0F1E60C9BF00626263 /* ASRectTableTests.m */,
 				CC11F9791DB181180024D77B /* ASNetworkImageNodeTests.m */,
@@ -1133,7 +1127,6 @@
 				CC8B05D71D73979700F54286 /* ASTextNodePerformanceTests.m */,
 				CC8B05D41D73836400F54286 /* ASPerformanceTestContext.h */,
 				CC8B05D51D73836400F54286 /* ASPerformanceTestContext.m */,
-				69B225681D7265DA00B25B22 /* ASXCTExtensions.h */,
 				CC54A81D1D7008B300296A24 /* ASDispatchTests.m */,
 				CCA221D21D6FA7EF00AF6A0F /* ASViewControllerTests.m */,
 				CC0AEEA31D66316E005D1C78 /* ASUICollectionViewTests.m */,
@@ -1521,6 +1514,21 @@
 			path = Layout;
 			sourceTree = "<group>";
 		};
+		CC583ABF1EF9BAB400134156 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				CC583AC01EF9BAB400134156 /* ASDisplayNode+OCMock.m */,
+				CC583AC11EF9BAB400134156 /* ASTestCase.h */,
+				CC583AC21EF9BAB400134156 /* ASTestCase.m */,
+				CC583AC31EF9BAB400134156 /* ASXCTExtensions.h */,
+				CC583AC41EF9BAB400134156 /* NSInvocation+ASTestHelpers.h */,
+				CC583AC51EF9BAB400134156 /* NSInvocation+ASTestHelpers.m */,
+				CC583AC61EF9BAB400134156 /* OCMockObject+ASAdditions.h */,
+				CC583AC71EF9BAB400134156 /* OCMockObject+ASAdditions.m */,
+			);
+			path = Common;
+			sourceTree = "<group>";
+		};
 		CCCCCCC11EC3EF060087FE10 /* TextExperiment */ = {
 			isa = PBXGroup;
 			children = (
@@ -2045,13 +2053,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				29CDC2E21AAE70D000833CA4 /* ASBasicImageDownloaderContextTests.m in Sources */,
+				CC583AD71EF9BDC100134156 /* NSInvocation+ASTestHelpers.m in Sources */,
 				CC051F1F1D7A286A006434CB /* ASCALayerTests.m in Sources */,
 				242995D31B29743C00090100 /* ASBasicImageDownloaderTests.m in Sources */,
 				296A0A351A951ABF005ACEAA /* ASBatchFetchingTests.m in Sources */,
 				ACF6ED5C1B178DC700DA7C62 /* ASCenterLayoutSpecSnapshotTests.mm in Sources */,
 				9F06E5CD1B4CAF4200F015D8 /* ASCollectionViewTests.mm in Sources */,
 				2911485C1A77147A005D0878 /* ASControlNodeTests.m in Sources */,
-				CCA5F62C1EEC9E9B0060C137 /* NSInvocation+ASTestHelpers.m in Sources */,
 				CC3B208E1C3F7D0A00798563 /* ASWeakSetTests.m in Sources */,
 				CC034A101E60C9BF00626263 /* ASRectTableTests.m in Sources */,
 				F711994E1D20C21100568860 /* ASDisplayNodeExtrasTests.m in Sources */,
@@ -2060,16 +2068,17 @@
 				CCA221D31D6FA7EF00AF6A0F /* ASViewControllerTests.m in Sources */,
 				058D0A38195D057000B7D73C /* ASDisplayLayerTests.m in Sources */,
 				2538B6F31BC5D2A2003CA0B4 /* ASCollectionViewFlowLayoutInspectorTests.m in Sources */,
+				CC583AD61EF9BDBE00134156 /* ASTestCase.m in Sources */,
 				058D0A39195D057000B7D73C /* ASDisplayNodeAppearanceTests.m in Sources */,
 				CCB2F34D1D63CCC6004E6DE9 /* ASDisplayNodeSnapshotTests.m in Sources */,
 				AE6987C11DD04E1000B9E458 /* ASPagerNodeTests.m in Sources */,
 				058D0A3A195D057000B7D73C /* ASDisplayNodeTests.mm in Sources */,
 				696FCB311D6E46050093471E /* ASBackgroundLayoutSpecSnapshotTests.mm in Sources */,
+				CC583AD81EF9BDC300134156 /* OCMockObject+ASAdditions.m in Sources */,
 				69FEE53D1D95A9AF0086F066 /* ASLayoutElementStyleTests.m in Sources */,
 				CC4981B31D1A02BE004E13CC /* ASTableViewThrashTests.m in Sources */,
 				CC54A81E1D7008B300296A24 /* ASDispatchTests.m in Sources */,
 				058D0A3B195D057000B7D73C /* ASDisplayNodeTestsHelper.m in Sources */,
-				CCB338E71EEE27760081F21A /* ASTestCase.m in Sources */,
 				83A7D95E1D446A6E00BF333E /* ASWeakMapTests.m in Sources */,
 				056D21551ABCEF50001107EF /* ASImageNodeSnapshotTests.m in Sources */,
 				AC026B581BD3F61800BBC17E /* ASAbsoluteLayoutSpecSnapshotTests.m in Sources */,
@@ -2079,9 +2088,8 @@
 				052EE0661A159FEF002C6279 /* ASMultiplexImageNodeTests.m in Sources */,
 				058D0A3C195D057000B7D73C /* ASMutableAttributedStringBuilderTests.m in Sources */,
 				CC8B05D81D73979700F54286 /* ASTextNodePerformanceTests.m in Sources */,
+				CC583AD91EF9BDC600134156 /* ASDisplayNode+OCMock.m in Sources */,
 				697B315A1CFE4B410049936F /* ASEditableTextNodeTests.m in Sources */,
-				CC311E071EEF81C400A8D7A6 /* ASDisplayNode+OCMock.m in Sources */,
-				CCB338E41EEE11160081F21A /* OCMockObject+ASAdditions.m in Sources */,
 				ACF6ED611B178DC700DA7C62 /* ASOverlayLayoutSpecSnapshotTests.mm in Sources */,
 				CC8B05D61D73836400F54286 /* ASPerformanceTestContext.m in Sources */,
 				CC0AEEA41D66316E005D1C78 /* ASUICollectionViewTests.m in Sources */,
diff --git a/Podfile b/Podfile
index 3f317b3a0..0d8cb0fa2 100644
--- a/Podfile
+++ b/Podfile
@@ -8,23 +8,23 @@ target :'AsyncDisplayKitTests' do
   pod 'JGMethodSwizzler', :git => 'https://github.com/JonasGessner/JGMethodSwizzler', :branch => 'master'
 
   # Only for buck build
-  pod 'PINRemoteImage', '3.0.0-beta.7'
+  pod 'PINRemoteImage', '3.0.0-beta.10'
+end
 
-  #TODO CocoaPods plugin instead?
-  post_install do |installer|
-    require 'fileutils'
+#TODO CocoaPods plugin instead?
+post_install do |installer|
+  require 'fileutils'
 
-    # Assuming we're at the root dir
-    buck_files_dir = 'buck-files'
-    if File.directory?(buck_files_dir)
-      installer.pod_targets.flat_map do |pod_target|
-        pod_name = pod_target.pod_name
-        # Copy the file at buck-files/BUCK_pod_name to Pods/pod_name/BUCK,
-        # override existing file if needed
-        buck_file = buck_files_dir + '/BUCK_' + pod_name
-        if File.file?(buck_file)
-          FileUtils.cp(buck_file, 'Pods/' + pod_name + '/BUCK', :preserve => false)
-        end
+  # Assuming we're at the root dir
+  buck_files_dir = 'buck-files'
+  if File.directory?(buck_files_dir)
+    installer.pod_targets.flat_map do |pod_target|
+      pod_name = pod_target.pod_name
+      # Copy the file at buck-files/BUCK_pod_name to Pods/pod_name/BUCK,
+      # override existing file if needed
+      buck_file = buck_files_dir + '/BUCK_' + pod_name
+      if File.file?(buck_file)
+        FileUtils.cp(buck_file, 'Pods/' + pod_name + '/BUCK', :preserve => false)
       end
     end
   end
diff --git a/ASDKListKit/ASDKListKit.xcodeproj/project.pbxproj b/SubspecWorkspaces/ASDKListKit/ASDKListKit.xcodeproj/project.pbxproj
similarity index 83%
rename from ASDKListKit/ASDKListKit.xcodeproj/project.pbxproj
rename to SubspecWorkspaces/ASDKListKit/ASDKListKit.xcodeproj/project.pbxproj
index d90f13803..814ad945a 100644
--- a/ASDKListKit/ASDKListKit.xcodeproj/project.pbxproj
+++ b/SubspecWorkspaces/ASDKListKit/ASDKListKit.xcodeproj/project.pbxproj
@@ -15,6 +15,10 @@
 		CC55323D1E16F2A90011C01F /* ASListTestCellNode.m in Sources */ = {isa = PBXBuildFile; fileRef = CC5532351E16F2A90011C01F /* ASListTestCellNode.m */; };
 		CC55323E1E16F2A90011C01F /* ASListTestObject.m in Sources */ = {isa = PBXBuildFile; fileRef = CC5532371E16F2A90011C01F /* ASListTestObject.m */; };
 		CC55323F1E16F2A90011C01F /* ASListKitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CC5532381E16F2A90011C01F /* ASListKitTests.m */; };
+		CCC31FAD1EF9B96600E41731 /* ASDisplayNode+OCMock.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC31FA51EF9B96600E41731 /* ASDisplayNode+OCMock.m */; };
+		CCC31FAE1EF9B96600E41731 /* ASTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC31FA71EF9B96600E41731 /* ASTestCase.m */; };
+		CCC31FAF1EF9B96600E41731 /* NSInvocation+ASTestHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC31FAA1EF9B96600E41731 /* NSInvocation+ASTestHelpers.m */; };
+		CCC31FB01EF9B96600E41731 /* OCMockObject+ASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC31FAC1EF9B96600E41731 /* OCMockObject+ASAdditions.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -35,7 +39,14 @@
 		CC5532361E16F2A90011C01F /* ASListTestObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASListTestObject.h; sourceTree = "<group>"; };
 		CC5532371E16F2A90011C01F /* ASListTestObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASListTestObject.m; sourceTree = "<group>"; };
 		CC5532381E16F2A90011C01F /* ASListKitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASListKitTests.m; sourceTree = "<group>"; };
-		CC55326C1E16F67A0011C01F /* ASXCTExtensions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASXCTExtensions.h; sourceTree = "<group>"; };
+		CCC31FA51EF9B96600E41731 /* ASDisplayNode+OCMock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ASDisplayNode+OCMock.m"; sourceTree = "<group>"; };
+		CCC31FA61EF9B96600E41731 /* ASTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASTestCase.h; sourceTree = "<group>"; };
+		CCC31FA71EF9B96600E41731 /* ASTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTestCase.m; sourceTree = "<group>"; };
+		CCC31FA81EF9B96600E41731 /* ASXCTExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASXCTExtensions.h; sourceTree = "<group>"; };
+		CCC31FA91EF9B96600E41731 /* NSInvocation+ASTestHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSInvocation+ASTestHelpers.h"; sourceTree = "<group>"; };
+		CCC31FAA1EF9B96600E41731 /* NSInvocation+ASTestHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSInvocation+ASTestHelpers.m"; sourceTree = "<group>"; };
+		CCC31FAB1EF9B96600E41731 /* OCMockObject+ASAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OCMockObject+ASAdditions.h"; sourceTree = "<group>"; };
+		CCC31FAC1EF9B96600E41731 /* OCMockObject+ASAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "OCMockObject+ASAdditions.m"; sourceTree = "<group>"; };
 		D6BDED6F23A72F40F571EEF0 /* Pods-ASDKListKitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ASDKListKitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ASDKListKitTests/Pods-ASDKListKitTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -92,7 +103,7 @@
 		CC5532251E16EB9D0011C01F /* ASDKListKitTests */ = {
 			isa = PBXGroup;
 			children = (
-				CC55326D1E16F67D0011C01F /* Common */,
+				CCC31FA41EF9B96600E41731 /* Common */,
 				CC55326E1E170A740011C01F /* ListKit Fixtures */,
 				CC5532381E16F2A90011C01F /* ASListKitTests.m */,
 				CC5532281E16EB9D0011C01F /* Info.plist */,
@@ -100,14 +111,6 @@
 			path = ASDKListKitTests;
 			sourceTree = "<group>";
 		};
-		CC55326D1E16F67D0011C01F /* Common */ = {
-			isa = PBXGroup;
-			children = (
-				CC55326C1E16F67A0011C01F /* ASXCTExtensions.h */,
-			);
-			name = Common;
-			sourceTree = "<group>";
-		};
 		CC55326E1E170A740011C01F /* ListKit Fixtures */ = {
 			isa = PBXGroup;
 			children = (
@@ -127,6 +130,22 @@
 			name = "ListKit Fixtures";
 			sourceTree = "<group>";
 		};
+		CCC31FA41EF9B96600E41731 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				CCC31FA51EF9B96600E41731 /* ASDisplayNode+OCMock.m */,
+				CCC31FA61EF9B96600E41731 /* ASTestCase.h */,
+				CCC31FA71EF9B96600E41731 /* ASTestCase.m */,
+				CCC31FA81EF9B96600E41731 /* ASXCTExtensions.h */,
+				CCC31FA91EF9B96600E41731 /* NSInvocation+ASTestHelpers.h */,
+				CCC31FAA1EF9B96600E41731 /* NSInvocation+ASTestHelpers.m */,
+				CCC31FAB1EF9B96600E41731 /* OCMockObject+ASAdditions.h */,
+				CCC31FAC1EF9B96600E41731 /* OCMockObject+ASAdditions.m */,
+			);
+			name = Common;
+			path = ../../Tests/Common;
+			sourceTree = SOURCE_ROOT;
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -204,7 +223,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		876CE14CAF6A87E34577E157 /* [CP] Copy Pods Resources */ = {
@@ -244,10 +263,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CCC31FAD1EF9B96600E41731 /* ASDisplayNode+OCMock.m in Sources */,
 				CC55323E1E16F2A90011C01F /* ASListTestObject.m in Sources */,
+				CCC31FAF1EF9B96600E41731 /* NSInvocation+ASTestHelpers.m in Sources */,
 				CC5532391E16F2A90011C01F /* ASListTestSupplementarySource.m in Sources */,
+				CCC31FB01EF9B96600E41731 /* OCMockObject+ASAdditions.m in Sources */,
 				CC55323D1E16F2A90011C01F /* ASListTestCellNode.m in Sources */,
 				CC55323B1E16F2A90011C01F /* ASListKitTestAdapterDataSource.m in Sources */,
+				CCC31FAE1EF9B96600E41731 /* ASTestCase.m in Sources */,
 				CC55323C1E16F2A90011C01F /* ASListTestSection.m in Sources */,
 				CC55323F1E16F2A90011C01F /* ASListKitTests.m in Sources */,
 				CC55323A1E16F2A90011C01F /* ASListTestSupplementaryNode.m in Sources */,
@@ -260,12 +283,14 @@
 		CC55321D1E16EB7A0011C01F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Debug;
 		};
 		CC55321E1E16EB7A0011C01F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 			};
 			name = Release;
 		};
@@ -311,7 +336,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = ASDKListKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -357,7 +382,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = ASDKListKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = asyncdisplaykit.ASDKListKitTests;
diff --git a/ASDKListKit/ASDKListKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SubspecWorkspaces/ASDKListKit/ASDKListKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from ASDKListKit/ASDKListKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to SubspecWorkspaces/ASDKListKit/ASDKListKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ASDKListKit/ASDKListKit.xcworkspace/contents.xcworkspacedata b/SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from ASDKListKit/ASDKListKit.xcworkspace/contents.xcworkspacedata
rename to SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace/contents.xcworkspacedata
diff --git a/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.h b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.h
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.h
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.h
diff --git a/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m
similarity index 89%
rename from ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m
index d336e9699..b9a86160a 100644
--- a/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m
+++ b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTestAdapterDataSource.m
@@ -25,7 +25,7 @@ - (NSArray *)objectsForListAdapter:(IGListAdapter *)listAdapter
   return self.objects;
 }
 
-- (IGListSectionController <IGListSectionType> *)listAdapter:(IGListAdapter *)listAdapter sectionControllerForObject:(id)object
+- (IGListSectionController *)listAdapter:(IGListAdapter *)listAdapter sectionControllerForObject:(id)object
 {
   ASListTestSection *section = [[ASListTestSection alloc] init];
   return section;
diff --git a/ASDKListKit/ASDKListKitTests/ASListKitTests.m b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTests.m
similarity index 98%
rename from ASDKListKit/ASDKListKitTests/ASListKitTests.m
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTests.m
index 11cfe879a..28b6205d7 100644
--- a/ASDKListKit/ASDKListKitTests/ASListKitTests.m
+++ b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListKitTests.m
@@ -20,8 +20,9 @@
 #import "ASListKitTestAdapterDataSource.h"
 #import "ASXCTExtensions.h"
 #import <JGMethodSwizzler/JGMethodSwizzler.h>
+#import "ASTestCase.h"
 
-@interface ASListKitTests : XCTestCase
+@interface ASListKitTests : ASTestCase
 
 @property (nonatomic, strong) ASCollectionNode *collectionNode;
 @property (nonatomic, strong) UICollectionView *collectionView;
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestCellNode.h b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.h
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestCellNode.h
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.h
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestCellNode.m b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.m
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestCellNode.m
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestCellNode.m
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestObject.h b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.h
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestObject.h
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.h
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestObject.m b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.m
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestObject.m
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestObject.m
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestSection.h b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.h
similarity index 90%
rename from ASDKListKit/ASDKListKitTests/ASListTestSection.h
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.h
index b374ac692..6e21457f9 100644
--- a/ASDKListKit/ASDKListKitTests/ASListTestSection.h
+++ b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.h
@@ -18,7 +18,7 @@
 #import <IGListKit/IGListKit.h>
 #import <AsyncDisplayKit/AsyncDisplayKit.h>
 
-@interface ASListTestSection : IGListSectionController <IGListSectionType, ASSectionController>
+@interface ASListTestSection : IGListSectionController <ASSectionController>
 
 @property (nonatomic) NSInteger itemCount;
 
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestSection.m b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.m
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestSection.m
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSection.m
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.h b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.h
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.h
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.h
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.m b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.m
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.m
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementaryNode.m
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h
similarity index 92%
rename from ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h
index 5449dbc86..37cb4816f 100644
--- a/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h
+++ b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.h
@@ -24,6 +24,6 @@
 
 @property (nonatomic, weak) id<IGListCollectionContext> collectionContext;
 
-@property (nonatomic, weak) IGListSectionController<IGListSectionType> *sectionController;
+@property (nonatomic, weak) IGListSectionController *sectionController;
 
 @end
diff --git a/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.m b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.m
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.m
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/ASListTestSupplementarySource.m
diff --git a/ASDKListKit/ASDKListKitTests/Info.plist b/SubspecWorkspaces/ASDKListKit/ASDKListKitTests/Info.plist
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/Info.plist
rename to SubspecWorkspaces/ASDKListKit/ASDKListKitTests/Info.plist
diff --git a/SubspecWorkspaces/ASDKListKit/Podfile b/SubspecWorkspaces/ASDKListKit/Podfile
new file mode 100644
index 000000000..d5b84556f
--- /dev/null
+++ b/SubspecWorkspaces/ASDKListKit/Podfile
@@ -0,0 +1,9 @@
+source 'https://github.com/CocoaPods/Specs.git'
+
+platform :ios, '8.0'
+target 'ASDKListKitTests' do
+  pod 'Texture/IGListKit', :path => '../..'
+  pod 'OCMock', '~> 3.4'
+  pod 'JGMethodSwizzler', :git => 'https://github.com/JonasGessner/JGMethodSwizzler', :branch => 'master'
+end
+
diff --git a/Tests/ASDisplayNodeTests.mm b/Tests/ASDisplayNodeTests.mm
index 7fc00759a..69d184687 100644
--- a/Tests/ASDisplayNodeTests.mm
+++ b/Tests/ASDisplayNodeTests.mm
@@ -2266,12 +2266,10 @@ - (void)testThatItIsAllowedToRetrieveDebugDescriptionIncludingVCOffMainThread
   UIViewController *vc = [[UIViewController alloc] init];
   [vc.view addSubnode:node];
   dispatch_group_t g = dispatch_group_create();
-  dispatch_group_enter(g);
   __block NSString *debugDescription;
-  [NSThread detachNewThreadWithBlock:^{
+  dispatch_group_async(g, dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
     debugDescription = [node debugDescription];
-    dispatch_group_leave(g);
-  }];
+  });
   dispatch_group_wait(g, DISPATCH_TIME_FOREVER);
   // Ensure the debug description contains the VC string.
   // Have to split into two lines because XCTAssert macro can't handle the stringWithFormat:.
diff --git a/Tests/ASXCTExtensions.h b/Tests/ASXCTExtensions.h
deleted file mode 100644
index 574b7a717..000000000
--- a/Tests/ASXCTExtensions.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * XCTest extensions for CGGeometry.
- *
- * Prefer these to XCTAssert(CGRectEqualToRect(...)) because you get output
- * that tells you what went wrong.
- * Could use NSValue, but using strings makes the description messages shorter.
- */
-
-#import <XCTest/XCTestAssertionsImpl.h>
-
-#define ASXCTAssertEqualSizes(s0, s1, ...) \
-  _XCTPrimitiveAssertEqualObjects(self, NSStringFromCGSize(s0), @#s0, NSStringFromCGSize(s1), @#s1, __VA_ARGS__)
-
-#define ASXCTAssertNotEqualSizes(s0, s1, ...) \
-  _XCTPrimitiveAssertNotEqualObjects(self, NSStringFromCGSize(s0), @#s0, NSStringFromCGSize(s1), @#s1, __VA_ARGS__)
-
-#define ASXCTAssertEqualPoints(p0, p1, ...) \
-  _XCTPrimitiveAssertEqualObjects(self, NSStringFromCGPoint(p0), @#p0, NSStringFromCGPoint(p1), @#p1, __VA_ARGS__)
-
-#define ASXCTAssertNotEqualPoints(p0, p1, ...) \
-  _XCTPrimitiveAssertNotEqualObjects(self, NSStringFromCGPoint(p0), @#p0, NSStringFromCGPoint(p1), @#p1, __VA_ARGS__)
-
-#define ASXCTAssertEqualRects(r0, r1, ...) \
-  _XCTPrimitiveAssertEqualObjects(self, NSStringFromCGRect(r0), @#r0, NSStringFromCGRect(r1), @#r1, __VA_ARGS__)
-
-#define ASXCTAssertNotEqualRects(r0, r1, ...) \
-  _XCTPrimitiveAssertNotEqualObjects(self, NSStringFromCGRect(r0), @#r0, NSStringFromCGRect(r1), @#r1, __VA_ARGS__)
-
-#define ASXCTAssertEqualDimensions(r0, r1, ...) \
-  _XCTPrimitiveAssertEqualObjects(self, NSStringFromASDimension(r0), @#r0, NSStringFromASDimension(r1), @#r1, __VA_ARGS__)
-
-#define ASXCTAssertNotEqualDimensions(r0, r1, ...) \
-  _XCTPrimitiveAssertNotEqualObjects(self, NSStringFromASDimension(r0), @#r0, NSStringFromASDimension(r1), @#r1, __VA_ARGS__)
-
-#define ASXCTAssertEqualSizeRanges(r0, r1, ...) \
-  _XCTPrimitiveAssertEqualObjects(self, NSStringFromASSizeRange(r0), @#r0, NSStringFromASSizeRange(r1), @#r1, __VA_ARGS__)
diff --git a/Tests/ASDisplayNode+OCMock.m b/Tests/Common/ASDisplayNode+OCMock.m
similarity index 100%
rename from Tests/ASDisplayNode+OCMock.m
rename to Tests/Common/ASDisplayNode+OCMock.m
diff --git a/Tests/ASTestCase.h b/Tests/Common/ASTestCase.h
similarity index 100%
rename from Tests/ASTestCase.h
rename to Tests/Common/ASTestCase.h
diff --git a/Tests/ASTestCase.m b/Tests/Common/ASTestCase.m
similarity index 96%
rename from Tests/ASTestCase.m
rename to Tests/Common/ASTestCase.m
index 5b4f9dddf..bc17a564c 100644
--- a/Tests/ASTestCase.m
+++ b/Tests/Common/ASTestCase.m
@@ -52,7 +52,9 @@ - (void)tearDown
     for (unsigned int i = 0; i < ivarCount; i++) {
       Ivar ivar = ivars[i];
       NSString *key = [NSString stringWithCString:ivar_getName(ivar) encoding:NSUTF8StringEncoding];
-      [self setValue:nil forKey:key];
+      if (OCMIsObjectType(ivar_getTypeEncoding(ivar))) {
+      	[self setValue:nil forKey:key];
+      }
     }
     if (ivars) {
       free(ivars);
diff --git a/ASDKListKit/ASDKListKitTests/ASXCTExtensions.h b/Tests/Common/ASXCTExtensions.h
similarity index 100%
rename from ASDKListKit/ASDKListKitTests/ASXCTExtensions.h
rename to Tests/Common/ASXCTExtensions.h
diff --git a/Tests/NSInvocation+ASTestHelpers.h b/Tests/Common/NSInvocation+ASTestHelpers.h
similarity index 100%
rename from Tests/NSInvocation+ASTestHelpers.h
rename to Tests/Common/NSInvocation+ASTestHelpers.h
diff --git a/Tests/NSInvocation+ASTestHelpers.m b/Tests/Common/NSInvocation+ASTestHelpers.m
similarity index 100%
rename from Tests/NSInvocation+ASTestHelpers.m
rename to Tests/Common/NSInvocation+ASTestHelpers.m
diff --git a/Tests/OCMockObject+ASAdditions.h b/Tests/Common/OCMockObject+ASAdditions.h
similarity index 100%
rename from Tests/OCMockObject+ASAdditions.h
rename to Tests/Common/OCMockObject+ASAdditions.h
diff --git a/Tests/OCMockObject+ASAdditions.m b/Tests/Common/OCMockObject+ASAdditions.m
similarity index 99%
rename from Tests/OCMockObject+ASAdditions.m
rename to Tests/Common/OCMockObject+ASAdditions.m
index 8b3235fb2..86dcdbf9d 100644
--- a/Tests/OCMockObject+ASAdditions.m
+++ b/Tests/Common/OCMockObject+ASAdditions.m
@@ -13,7 +13,6 @@
 #import "OCMockObject+ASAdditions.h"
 
 #import <OCMock/OCMock.h>
-#import "ASInternalHelpers.h"
 #import <objc/runtime.h>
 #import "ASTestCase.h"
 
diff --git a/build.sh b/build.sh
index 8720c66fe..1684c2497 100755
--- a/build.sh
+++ b/build.sh
@@ -83,9 +83,9 @@ fi
 
 if [ "$MODE" = "tests_listkit" ]; then
     echo "Building & testing AsyncDisplayKit+IGListKit."
-    pod install --project-directory=ASDKListKit
+    pod install --project-directory=SubspecWorkspaces/ASDKListKit
     set -o pipefail && xcodebuild \
-        -workspace ASDKListKit/ASDKListKit.xcworkspace \
+        -workspace SubspecWorkspaces/ASDKListKit/ASDKListKit.xcworkspace \
         -scheme ASDKListKitTests \
         -sdk "$SDK" \
         -destination "$PLATFORM" \