@@ -21,11 +21,13 @@
 #import "OFASN1BitString.h"
 #import "OFASN1Boolean.h"
 #import "OFASN1IA5String.h"
 #import "OFASN1Integer.h"
 #import "OFASN1Null.h"
+#import "OFASN1NumericString.h"
 #import "OFASN1OctetString.h"
+#import "OFASN1PrintableString.h"
 #import "OFASN1UTF8String.h"
 #import "OFArray.h"
 #import "OFString.h"
 #import "OFAutoreleasePool.h"
 
@@ -43,10 +45,11 @@
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFASN1BitString *bitString;
 	OFArray *array;
 
+	/* Boolean */
 	TEST(@"Parsing of boolean",
 	    ![[[OFData dataWithItems: "\x01\x01\x00"
 			       count: 3] ASN1DERValue] booleanValue] &&
 	    [[[OFData dataWithItems: "\x01\x01\xFF"
 			      count: 3] ASN1DERValue] booleanValue])
@@ -65,10 +68,11 @@
 
 	EXPECT_EXCEPTION(@"Detection of truncated boolean",
 	    OFTruncatedDataException, [[OFData dataWithItems: "\x01\x01"
 						       count: 2] ASN1DERValue])
 
+	/* Integer */
 	TEST(@"Parsing of integer",
 	    [[[OFData dataWithItems: "\x02\x00"
 			      count: 2] ASN1DERValue] integerValue] == 0 &&
 	    [[[OFData dataWithItems: "\x02\x01\x01"
 			      count: 3] ASN1DERValue] integerValue] == 1 &&
@@ -103,10 +107,11 @@
 
 	EXPECT_EXCEPTION(@"Detection of truncated integer",
 	    OFTruncatedDataException, [[OFData dataWithItems: "\x02\x02\x00"
 						       count: 3] ASN1DERValue])
 
+	/* Bit string */
 	TEST(@"Parsing of bit string",
 	    (bitString = [[OFData dataWithItems: "\x03\x01\x00"
 					  count: 3] ASN1DERValue]) &&
 	    [[bitString bitStringValue] isEqual: [OFData dataWithItems: ""
 								 count: 0]] &&
@@ -120,11 +125,11 @@
 	    (bitString = [[OFData dataWithItems: "\x03\x81\x80\x00xxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxx"
-			      count: 131] ASN1DERValue]) &&
+					  count: 131] ASN1DERValue]) &&
 	    [[bitString bitStringValue]
 	    isEqual: [OFData dataWithItems: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxx"
@@ -147,20 +152,21 @@
 
 	EXPECT_EXCEPTION(@"Detection of truncated bit string",
 	    OFTruncatedDataException, [[OFData dataWithItems: "\x03\x01"
 						       count: 2] ASN1DERValue])
 
+	/* Octet string */
 	TEST(@"Parsing of octet string",
 	    [[[[OFData dataWithItems: "\x04\x0CHello World!"
 			      count: 14] ASN1DERValue] octetStringValue]
 	    isEqual: [OFData dataWithItems: "Hello World!"
 				     count: 12]] &&
 	    [[[[OFData dataWithItems: "\x04\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxx"
-			      count: 131] ASN1DERValue] octetStringValue]
+			       count: 131] ASN1DERValue] octetStringValue]
 	    isEqual: [OFData dataWithItems: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxxx"
 				     count: 128]])
@@ -173,28 +179,30 @@
 
 	EXPECT_EXCEPTION(@"Detection of truncated octet string",
 	    OFTruncatedDataException, [[OFData dataWithItems: "\x04\x01"
 						       count: 2] ASN1DERValue])
 
-	TEST(@"Parsing of NULL",
+	/* Null */
+	TEST(@"Parsing of null",
 	    [[[OFData dataWithItems: "\x05\x00"
 			      count: 2] ASN1DERValue]
 	    isKindOfClass: [OFASN1Null class]])
 
 	EXPECT_EXCEPTION(@"Detection of invalid NULL",
 	    OFInvalidFormatException, [[OFData dataWithItems: "\x05\x01\x00"
 						       count: 3] ASN1DERValue])
 
+	/* UTF-8 string */
 	TEST(@"Parsing of UTF-8 string",
 	    [[[[OFData dataWithItems: "\x0C\x0EHällo Wörld!"
-			      count: 16] ASN1DERValue] UTF8StringValue]
+			       count: 16] ASN1DERValue] UTF8StringValue]
 	    isEqual: @"Hällo Wörld!"] &&
 	    [[[[OFData dataWithItems: "\x0C\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxx"
-			      count: 131] ASN1DERValue] UTF8StringValue]
+			       count: 131] ASN1DERValue] UTF8StringValue]
 	    isEqual: @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 		     @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 		     @"xxxxxxxxxxxxxxxx"])
 
 	EXPECT_EXCEPTION(@"Detection of out of range UTF-8 string",
@@ -221,10 +229,11 @@
 				    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				    "xxxxxxxxxxxxxxxxxx"
 			     count: 132] ASN1DERValue])
 
+	/* Sequence */
 	TEST(@"Parsing of sequence",
 	    (array = [[OFData dataWithItems: "\x30\x00"
 				      count: 2] ASN1DERValue]) &&
 	    [array isKindOfClass: [OFArray class]] && [array count] == 0 &&
 	    (array = [[OFData dataWithItems: "\x30\x09\x02\x01\x7B\x0C\x04Test"
@@ -240,19 +249,78 @@
 	EXPECT_EXCEPTION(@"Parsing of truncated sequence #2",
 	    OFTruncatedDataException,
 	    [[OFData dataWithItems: "\x30\x04\x02\x01\x01\x00\x00"
 			     count: 7] ASN1DERValue])
 
+	/* NumericString */
+	TEST(@"Parsing of NumericString",
+	    [[[[OFData dataWithItems: "\x12\x0B" "12345 67890"
+			      count: 13] ASN1DERValue] numericStringValue]
+	    isEqual: @"12345 67890"] &&
+	    [[[[OFData dataWithItems: "\x12\x81\x80" "0000000000000000000000000"
+				      "0000000000000000000000000000000000000000"
+				      "0000000000000000000000000000000000000000"
+				      "00000000000000000000000"
+			       count: 131] ASN1DERValue] numericStringValue]
+	    isEqual: @"00000000000000000000000000000000000000000000000000000000"
+		     @"00000000000000000000000000000000000000000000000000000000"
+		     @"0000000000000000"])
+
+	EXPECT_EXCEPTION(@"Detection of invalid NumericString",
+	    OFInvalidEncodingException,
+	    [[OFData dataWithItems: "\x12\x02."
+			     count: 4] ASN1DERValue])
+
+	EXPECT_EXCEPTION(@"Detection of out of range NumericString",
+	    OFOutOfRangeException,
+	    [[OFData dataWithItems: "\x12\x89"
+				    "\x01\x01\x01\x01\x01\x01\x01\x01\x01"
+			     count: 11] ASN1DERValue])
+
+	EXPECT_EXCEPTION(@"Detection of truncated NumericString",
+	    OFTruncatedDataException, [[OFData dataWithItems: "\x12\x01"
+						       count: 2] ASN1DERValue])
+
+	/* PrintableString */
+	TEST(@"Parsing of PrintableString",
+	    [[[[OFData dataWithItems: "\x13\x0CHello World."
+			       count: 14] ASN1DERValue] printableStringValue]
+	    isEqual: @"Hello World."] &&
+	    [[[[OFData dataWithItems: "\x13\x81\x80 '()+,-./:=?abcdefghijklmnop"
+				      "qrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ '()"
+				      "+,-./:=?abcdefghijklmnopqrstuvwxyzABCDEF"
+				      "GHIJKLMNOPQRSTUVWXYZ"
+			       count: 131] ASN1DERValue] printableStringValue]
+	    isEqual: @" '()+,-./:=?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQR"
+		     @"STUVWXYZ '()+,-./:=?abcdefghijklmnopqrstuvwxyzABCDEFGHIJ"
+		     @"KLMNOPQRSTUVWXYZ"])
+
+	EXPECT_EXCEPTION(@"Detection of invalid PrintableString",
+	    OFInvalidEncodingException,
+	    [[OFData dataWithItems: "\x13\x02;"
+			     count: 4] ASN1DERValue])
+
+	EXPECT_EXCEPTION(@"Detection of out of range PrintableString",
+	    OFOutOfRangeException,
+	    [[OFData dataWithItems: "\x13\x89"
+				    "\x01\x01\x01\x01\x01\x01\x01\x01\x01"
+			     count: 11] ASN1DERValue])
+
+	EXPECT_EXCEPTION(@"Detection of truncated PrintableString",
+	    OFTruncatedDataException, [[OFData dataWithItems: "\x13\x01"
+						       count: 2] ASN1DERValue])
+
+	/* IA5String */
 	TEST(@"Parsing of IA5String",
 	    [[[[OFData dataWithItems: "\x16\x0CHello World!"
-			      count: 14] ASN1DERValue] IA5StringValue]
+			       count: 14] ASN1DERValue] IA5StringValue]
 	    isEqual: @"Hello World!"] &&
 	    [[[[OFData dataWithItems: "\x16\x81\x80xxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 				      "xxxxxxxxxxxxxxxxxxxx"
-			      count: 131] ASN1DERValue] IA5StringValue]
+			       count: 131] ASN1DERValue] IA5StringValue]
 	    isEqual: @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 		     @"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 		     @"xxxxxxxxxxxxxxxx"])
 
 	EXPECT_EXCEPTION(@"Detection of invalid IA5String",