@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -15,50 +15,58 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFSerialization";
+static OFString *const module = @"OFSerialization";
 
 @implementation TestsAppDelegate (OFSerializationTests)
 - (void)serializationTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFMutableDictionary *d = [OFMutableDictionary dictionary];
-	OFMutableArray *a = [OFMutableArray array];
-	OFList *l = [OFList list];
+	OFMutableDictionary *dict = [OFMutableDictionary dictionary];
+	OFMutableArray *array = [OFMutableArray array];
+	OFList *list = [OFList list];
 	OFData *data;
-	OFString *s;
-
-	[a addObject: @"Qu\"xbar\ntest"];
-	[a addObject: [OFNumber numberWithInt: 1234]];
-	[a addObject: [OFNumber numberWithDouble: 1234.5678]];
-	[a addObject: [OFMutableString stringWithString: @"asd"]];
-	[a addObject: [OFDate dateWithTimeIntervalSince1970: 1234.5678]];
-
-	[d setObject: @"Hello" forKey: a];
-	[d setObject: @"B\"la" forKey: @"Blub"];
-
-	[l appendObject: @"Hello"];
-	[l appendObject: @"Wo\rld!\nHow are you?"];
-	[l appendObject: [OFURL URLWithString: @"https://objfw.nil.im/"]];
-	[l appendObject:
+	OFString *string;
+	OFUUID *UUID;
+
+	[array addObject: @"Qu\"xbar\ntest"];
+	[array addObject: [OFNumber numberWithInt: 1234]];
+	[array addObject: [OFNumber numberWithDouble: 1234.5678]];
+	[array addObject: [OFMutableString stringWithString: @"asd"]];
+	[array addObject: [OFDate dateWithTimeIntervalSince1970: 1234.5678]];
+
+	[dict setObject: @"Hello" forKey: array];
+	[dict setObject: @"B\"la" forKey: @"Blub"];
+
+	[list appendObject: @"Hello"];
+	[list appendObject: @"Wo\rld!\nHow are you?"];
+	[list appendObject: [OFURL URLWithString: @"https://objfw.nil.im/"]];
+	[list appendObject:
 	    [OFXMLElement elementWithXMLString: @"<x><y/><![CDATA[<]]></x>"]];
-	[l appendObject: [OFSet setWithObjects: @"foo", @"foo", @"bar", nil]];
-	[l appendObject:
+	[list appendObject:
+	    [OFSet setWithObjects: @"foo", @"foo", @"bar", nil]];
+	[list appendObject:
 	    [OFCountedSet setWithObjects: @"foo", @"foo", @"bar", nil]];
 
-	[d setObject: @"list" forKey: l];
+	[dict setObject: @"list" forKey: list];
 
 	data = [OFData dataWithItems: "0123456789:;<ABCDEFGHJIKLMNOPQRSTUVWXYZ"
 			       count: 39];
-	[d setObject: @"data" forKey: data];
+	[dict setObject: @"data" forKey: data];
+
+	UUID = [OFUUID
+	    UUIDWithUUIDString: @"01234567-89AB-CDEF-FEDC-BA9876543210"];
+	[dict setObject: @"uuid" forKey: UUID];
 
 	TEST(@"-[stringBySerializing]",
-	    (s = d.stringBySerializing) && [s isEqual:
-	    [OFString stringWithContentsOfFile: @"serialization.xml"]])
+	    (string = dict.stringBySerializing) && [string isEqual:
+	    [OFString stringWithContentsOfURL: [OFURL URLWithString:
+	    @"objfw-embedded:///serialization.xml"]]])
 
-	TEST(@"-[objectByDeserializing]", [s.objectByDeserializing isEqual: d])
+	TEST(@"-[objectByDeserializing]",
+	    [string.objectByDeserializing isEqual: dict])
 
 	objc_autoreleasePoolPop(pool);
 }
 @end