@@ -14,11 +14,11 @@
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
 
-#import "main.h"
+#import "TestsAppDelegate.h"
 
 static OFString *module = @"OFString";
 static OFString* whitespace[] = {
 	@" \r \t\n\t \tasd  \t \t\t\r\n",
 	@" \t\t  \t\t  \t \t"
@@ -35,12 +35,12 @@
 
 	return nil;
 }
 @end
 
-void
-string_tests()
+@implementation TestsAppDelegate (OFStringTests)
+- (void)stringTests
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFMutableString *s[3];
 	OFArray *a;
 	int i;
@@ -339,5 +339,6 @@
 	    (s[0] = [@"x&foo;y" stringByXMLUnescapingWithHandler: h]) &&
 	    [s[0] isEqual: @"xbary"])
 
 	[pool drain];
 }
+@end