@@ -52,34 +52,18 @@
 				   inModule: module];	\
 			_fails++;			\
 		}					\
 	}
 #define R(...) (__VA_ARGS__, 1)
-#define PRINT(color, fmt, ...)					\
-	{							\
-		OFString *msg = [OFString stringWithFormat:	\
-		    @"[%@] " fmt @"\n", module, __VA_ARGS__];	\
-		[self outputString: msg				\
-			   inColor: color];			\
-	}
 
 @class OFString;
 
-enum {
-	NO_COLOR,
-	RED,
-	GREEN,
-	YELLOW
-};
-
 @interface TestsAppDelegate: OFObject <OFApplicationDelegate>
 {
 	int _fails;
 }
 
-- (void)outputString: (OFString *)str
-	     inColor: (int)color;
 - (void)outputTesting: (OFString *)test
 	     inModule: (OFString *)module;
 - (void)outputSuccess: (OFString *)test
 	     inModule: (OFString *)module;
 - (void)outputFailure: (OFString *)test
@@ -131,10 +115,14 @@
 @end
 
 @interface TestsAppDelegate (OFINIFileTests)
 - (void)INIFileTests;
 @end
+
+@interface TestsAppDelegate (OFIPXSocketTests)
+- (void)IPXSocketTests;
+@end
 
 @interface TestsAppDelegate (OFInvocationTests)
 - (void)invocationTests;
 @end
 
@@ -188,18 +176,10 @@
 
 @interface TestsAppDelegate (ScryptTests)
 - (void)scryptTests;
 @end
 
-@interface TestsAppDelegate (OFSerializationTests)
-- (void)serializationTests;
-@end
-
-@interface TestsAppDelegate (OFSetTests)
-- (void)setTests;
-@end
-
 @interface TestsAppDelegate (OFSHA1HashTests)
 - (void)SHA1HashTests;
 @end
 
 @interface TestsAppDelegate (OFSHA224HashTests)
@@ -215,10 +195,30 @@
 @end
 
 @interface TestsAppDelegate (OFSHA512HashTests)
 - (void)SHA512HashTests;
 @end
+
+@interface TestsAppDelegate (OFSCTPSocketTests)
+- (void)SCTPSocketTests;
+@end
+
+@interface TestsAppDelegate (OFSPXSocketTests)
+- (void)SPXSocketTests;
+@end
+
+@interface TestsAppDelegate (OFSPXStreamSocketTests)
+- (void)SPXStreamSocketTests;
+@end
+
+@interface TestsAppDelegate (OFSerializationTests)
+- (void)serializationTests;
+@end
+
+@interface TestsAppDelegate (OFSetTests)
+- (void)setTests;
+@end
 
 @interface TestsAppDelegate (OFSystemInfoTests)
 - (void)systemInfoTests;
 @end