@@ -102,10 +102,23 @@
 #ifdef OF_HAVE_FILES
 	TEST(@"+[fileURLWithPath:]",
 	    [[[OFURL fileURLWithPath: @"testfile.txt"] fileSystemRepresentation]
 	    isEqual: [[[OFFileManager defaultManager] currentDirectoryPath]
 	    stringByAppendingPathComponent: @"testfile.txt"]])
+
+# ifdef OF_WINDOWS
+	OFURL *tmp;
+	TEST(@"+[fileURLWithPath:] with UNC",
+	    (tmp = [OFURL fileURLWithPath: @"\\\\foo\\bar"]) &&
+	    [tmp.host isEqual: @"foo"] && [tmp.path isEqual: @"/bar"] &&
+	    [tmp.string isEqual: @"file://foo/bar"] &&
+	    [tmp.fileSystemRepresentation isEqual: @"\\\\foo\\bar"] &&
+	    (tmp = [OFURL fileURLWithPath: @"\\\\test"]) &&
+	    [tmp.host isEqual: @"test"] && [tmp.path isEqual: @"/"] &&
+	    [tmp.string isEqual: @"file://test/"] &&
+	    [tmp.fileSystemRepresentation isEqual: @"\\\\test"])
+# endif
 #endif
 
 	TEST(@"-[string]",
 	    [[u1 string] isEqual: url_str] &&
 	    [[u2 string] isEqual: @"http://foo:80"] &&
@@ -126,11 +139,11 @@
 	TEST(@"-[pathComponents]",
 	    [[u1 pathComponents] isEqual:
 	    [OFArray arrayWithObjects: @"", @"pa?th", nil]] &&
 	    [[u4 pathComponents] isEqual:
 	    [OFArray arrayWithObjects: @"", @"etc", @"passwd", nil]])
-	TEST(@"-[lastPathComponent",
+	TEST(@"-[lastPathComponent]",
 	    [[[OFURL URLWithString: @"http://host/foo//bar/baz"]
 	    lastPathComponent] isEqual: @"baz"] &&
 	    [[[OFURL URLWithString: @"http://host/foo//bar/baz/"]
 	    lastPathComponent] isEqual: @"baz"] &&
 	    [[[OFURL URLWithString: @"http://host/foo/"]