@@ -94,32 +94,32 @@
 
 	/* Bit string */
 	TEST(@"Parsing of bit string",
 	    (bitString = [[OFData dataWithItems: "\x03\x01\x00"
 					  count: 3] ASN1DERValue]) &&
-	    [[bitString bitStringValue] isEqual: [OFData dataWithItems: ""
-								 count: 0]] &&
-	    [bitString bitStringLength] == 0 &&
+	    [bitString.bitStringValue isEqual: [OFData dataWithItems: ""
+					count: 0]] &&
+	    bitString.bitStringLength == 0 &&
 	    (bitString = [[OFData dataWithItems: "\x03\x0D\x01Hello World\x80"
 					  count: 15] ASN1DERValue]) &&
-	    [[bitString bitStringValue]
+	    [bitString.bitStringValue
 	    isEqual: [OFData dataWithItems: "Hello World\x80"
 				     count: 12]] &&
-	    [bitString bitStringLength] == 97 &&
+	    bitString.bitStringLength == 97 &&
 	    (bitString = [[OFData dataWithItems: "\x03\x81\x80\x00xxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 						 "xxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					  count: 131] ASN1DERValue]) &&
-	    [[bitString bitStringValue]
+	    [bitString.bitStringValue
 	    isEqual: [OFData dataWithItems: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 					    "xxxxxxxxxxxxxxxxxxxxxxxxx"
 				     count: 127]] &&
-	    [bitString bitStringLength] == 127 * 8)
+	    bitString.bitStringLength == 127 * 8)
 
 	EXPECT_EXCEPTION(@"Detection of invalid bit string #1",
 	    OFInvalidFormatException, [[OFData dataWithItems: "\x03\x00"
 						       count: 2] ASN1DERValue])
 
@@ -175,27 +175,27 @@
 
 	/* Object Identifier */
 	TEST(@"Parsing of Object Identifier",
 	    (array = [[[OFData dataWithItems: "\x06\x01\x27"
 				       count: 3] ASN1DERValue]
-	    subidentifiers]) && [array count] == 2 &&
+	    subidentifiers]) && array.count == 2 &&
 	    [[array objectAtIndex: 0] uIntMaxValue] == 0 &&
 	    [[array objectAtIndex: 1] uIntMaxValue] == 39 &&
 	    (array = [[[OFData dataWithItems: "\x06\x01\x4F"
 				       count: 3] ASN1DERValue]
-	    subidentifiers]) && [array count] == 2 &&
+	    subidentifiers]) && array.count == 2 &&
 	    [[array objectAtIndex: 0] uIntMaxValue] == 1 &&
 	    [[array objectAtIndex: 1] uIntMaxValue] == 39 &&
 	    (array = [[[OFData dataWithItems: "\x06\x02\x88\x37"
 				       count: 4] ASN1DERValue]
-	    subidentifiers]) && [array count] == 2 &&
+	    subidentifiers]) && array.count == 2 &&
 	    [[array objectAtIndex: 0] uIntMaxValue] == 2 &&
 	    [[array objectAtIndex: 1] uIntMaxValue] == 999 &&
 	    (array = [[[OFData dataWithItems: "\x06\x09\x2A\x86\x48\x86\xF7\x0D"
 					      "\x01\x01\x0B"
 				       count: 11] ASN1DERValue]
-	    subidentifiers]) && [array count] == 7 &&
+	    subidentifiers]) && array.count == 7 &&
 	    [[array objectAtIndex: 0] uIntMaxValue] == 1 &&
 	    [[array objectAtIndex: 1] uIntMaxValue] == 2 &&
 	    [[array objectAtIndex: 2] uIntMaxValue] == 840 &&
 	    [[array objectAtIndex: 3] uIntMaxValue] == 113549 &&
 	    [[array objectAtIndex: 4] uIntMaxValue] == 1 &&
@@ -301,14 +301,14 @@
 
 	/* Sequence */
 	TEST(@"Parsing of sequence",
 	    (array = [[OFData dataWithItems: "\x30\x00"
 				      count: 2] ASN1DERValue]) &&
-	    [array isKindOfClass: [OFArray class]] && [array count] == 0 &&
+	    [array isKindOfClass: [OFArray class]] && array.count == 0 &&
 	    (array = [[OFData dataWithItems: "\x30\x09\x02\x01\x7B\x0C\x04Test"
 				      count: 11] ASN1DERValue]) &&
-	    [array isKindOfClass: [OFArray class]] && [array count] == 2 &&
+	    [array isKindOfClass: [OFArray class]] && array.count == 2 &&
 	    [[array objectAtIndex: 0] integerValue] == 123 &&
 	    [[[array objectAtIndex: 1] stringValue] isEqual: @"Test"])
 
 	EXPECT_EXCEPTION(@"Detection of truncated sequence #1",
 	    OFTruncatedDataException, [[OFData dataWithItems: "\x30\x01"
@@ -321,14 +321,14 @@
 
 	/* Set */
 	TEST(@"Parsing of set",
 	    (set = [[OFData dataWithItems: "\x31\x00"
 				    count: 2] ASN1DERValue]) &&
-	    [set isKindOfClass: [OFSet class]] && [set count] == 0 &&
+	    [set isKindOfClass: [OFSet class]] && set.count == 0 &&
 	    (set = [[OFData dataWithItems: "\x31\x09\x02\x01\x7B\x0C\x04Test"
 				    count: 11] ASN1DERValue]) &&
-	    [set isKindOfClass: [OFSet class]] && [set count] == 2 &&
+	    [set isKindOfClass: [OFSet class]] && set.count == 2 &&
 	    (enumerator = [set objectEnumerator]) &&
 	    [[enumerator nextObject] integerValue] == 123 &&
 	    [[[enumerator nextObject] stringValue] isEqual: @"Test"])
 
 	EXPECT_EXCEPTION(@"Detection of invalid set",