@@ -290,22 +290,21 @@
 	    [[OFData dataWithItems: "\x0A\x02\x00"
 			     count: 3] objectByParsingASN1DER])
 
 	/* UTF-8 string */
 	TEST(@"Parsing of UTF-8 string",
-	    [[[[OFData dataWithItems: "\x0C\x0EHällo Wörld!"
+	    [[[OFData dataWithItems: "\x0C\x0EHällo Wörld!"
 			       count: 16] objectByParsingASN1DER]
-	    UTF8StringValue] isEqual: @"Hällo Wörld!"] &&
-	    [[[[OFData dataWithItems: "\x0C\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-				      "xxxxxxxxxxxxxxxxxxxx"
-			       count: 131] objectByParsingASN1DER]
-	    UTF8StringValue] isEqual: @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-				      @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-				      @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-				      @"xxxxxxxxxxx"])
+	    isEqual: @"Hällo Wörld!"] &&
+	    [[[OFData dataWithItems: "\x0C\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+				     "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+				     "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+				     "xxxxxxxxxxxxxxxxx"
+			      count: 131] objectByParsingASN1DER]
+	    isEqual: @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+		     @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+		     @"xxxxxxxxxxxxxxxx"])
 
 	EXPECT_EXCEPTION(@"Detection of out of range UTF-8 string",
 	    OFOutOfRangeException,
 	    [[OFData dataWithItems: "\x0C\x89"
 				    "\x01\x01\x01\x01\x01\x01\x01\x01\x01"
@@ -341,11 +340,11 @@
 	    [array isKindOfClass: [OFArray class]] && array.count == 0 &&
 	    (array = [[OFData dataWithItems: "\x30\x09\x02\x01\x7B\x0C\x04Test"
 				      count: 11] objectByParsingASN1DER]) &&
 	    [array isKindOfClass: [OFArray class]] && array.count == 2 &&
 	    [[array objectAtIndex: 0] longLongValue] == 123 &&
-	    [[[array objectAtIndex: 1] stringValue] isEqual: @"Test"])
+	    [[array objectAtIndex: 1] isEqual: @"Test"])
 
 	EXPECT_EXCEPTION(@"Detection of truncated sequence #1",
 	    OFTruncatedDataException,
 	    [[OFData dataWithItems: "\x30\x01"
 			     count: 2] objectByParsingASN1DER])
@@ -363,11 +362,11 @@
 	    (set = [[OFData dataWithItems: "\x31\x09\x02\x01\x7B\x0C\x04Test"
 				    count: 11] objectByParsingASN1DER]) &&
 	    [set isKindOfClass: [OFSet class]] && set.count == 2 &&
 	    (enumerator = [set objectEnumerator]) &&
 	    [[enumerator nextObject] longLongValue] == 123 &&
-	    [[[enumerator nextObject] stringValue] isEqual: @"Test"])
+	    [[enumerator nextObject] isEqual: @"Test"])
 
 	EXPECT_EXCEPTION(@"Detection of invalid set",
 	    OFInvalidFormatException,
 	    [[OFData dataWithItems: "\x31\x06\x02\x01\x02\x02\x01\x01"
 			     count: 8] objectByParsingASN1DER])