diff --git a/Tests/base/NSAffineTransform/basic.m b/Tests/base/NSAffineTransform/basic.m
index 5a18de245..579c27466 100644
--- a/Tests/base/NSAffineTransform/basic.m
+++ b/Tests/base/NSAffineTransform/basic.m
@@ -61,6 +61,7 @@ int main()
    
   test_NSObject(@"NSAffineTransform", testObjs);
   test_NSCoding(testObjs);
+//  test_keyed_NSCoding(testObjs);
   test_NSCopying(@"NSAffineTransform", @"NSAffineTransform", testObjs, NO, YES);
   
   testObj = [NSAffineTransform transform];
diff --git a/Tests/base/NSArray/basic.m b/Tests/base/NSArray/basic.m
index fc0f56e16..2c8cba809 100644
--- a/Tests/base/NSArray/basic.m
+++ b/Tests/base/NSArray/basic.m
@@ -18,6 +18,7 @@ int main()
   [testObjs addObject: obj];
   test_NSObject(@"NSArray", testObjs);
   test_NSCoding(testObjs);
+  test_keyed_NSCoding(testObjs);
   test_NSCopying(@"NSArray",@"NSMutableArray",testObjs,YES,NO);
   test_NSMutableCopying(@"NSArray",@"NSMutableArray",testObjs);
   
@@ -28,7 +29,7 @@ int main()
    * mutable array ... we currently copy that
    */
   PASS([obj isKindOfClass: [NSMutableArray class]] == YES,"array mutable");
-  PASS_RUNS([obj addObject: @"x"],"can add to array");
+  PASS_RUNS([(NSMutableArray*)obj addObject: @"x"],"can add to array");
 #else
   PASS([obj isKindOfClass: [NSMutableArray class]] == NO,"array immutable");
 #endif
diff --git a/Tests/base/NSAttributedString/basic.m b/Tests/base/NSAttributedString/basic.m
index b24280e31..2d10f4b81 100644
--- a/Tests/base/NSAttributedString/basic.m
+++ b/Tests/base/NSAttributedString/basic.m
@@ -9,6 +9,7 @@ int main()
   test_alloc(@"NSAttributedString");
   test_NSObject(@"NSAttributedString", arr);
   test_NSCoding(arr);
+  test_keyed_NSCoding(arr);
   test_NSCopying(@"NSAttributedString",@"NSMutableAttributedString",arr,NO, NO);
   test_NSMutableCopying(@"NSAttributedString",@"NSMutableAttributedString",arr);
 
diff --git a/Tests/base/NSData/basic.m b/Tests/base/NSData/basic.m
index 99fe51fa1..db1b302ed 100644
--- a/Tests/base/NSData/basic.m
+++ b/Tests/base/NSData/basic.m
@@ -9,6 +9,7 @@ int main()
   test_alloc(@"NSData");
   test_NSObject(@"NSData",[NSArray arrayWithObject:testObject]);
   test_NSCoding([NSArray arrayWithObject:testObject]);
+  test_keyed_NSCoding([NSArray arrayWithObject:testObject]);
   test_NSCopying(@"NSData",
                  @"NSMutableData",
 		 [NSArray arrayWithObject:testObject], NO, NO);
diff --git a/Tests/base/NSDate/basic.m b/Tests/base/NSDate/basic.m
index b79371085..f08734df3 100644
--- a/Tests/base/NSDate/basic.m
+++ b/Tests/base/NSDate/basic.m
@@ -9,6 +9,7 @@ int main()
   
   test_NSObject(@"NSDate",[NSArray arrayWithObject:[NSDate new]]);
   test_NSCoding([NSArray arrayWithObject:testObj]);
+  test_keyed_NSCoding([NSArray arrayWithObject:testObj]);
   test_NSCopying(@"NSDate",@"NSDate",[NSArray arrayWithObject:testObj],NO,NO);
    
   [arp release]; arp = nil;
diff --git a/Tests/base/NSDictionary/basic.m b/Tests/base/NSDictionary/basic.m
index a0477bf9b..c660eaaed 100644
--- a/Tests/base/NSDictionary/basic.m
+++ b/Tests/base/NSDictionary/basic.m
@@ -26,6 +26,7 @@ int main()
   
   test_NSObject(@"NSDictionary", testObjs);
   test_NSCoding(testObjs);
+  test_keyed_NSCoding(testObjs);
   test_NSCopying(@"NSDictionary", @"NSMutableDictionary", testObjs, YES, NO);
   test_NSMutableCopying(@"NSDictionary", @"NSMutableDictionary", testObjs);
   START_SET("NSArray subscripting")
diff --git a/Tests/base/NSMutableArray/basic.m b/Tests/base/NSMutableArray/basic.m
index d406c3354..9e3449da3 100644
--- a/Tests/base/NSMutableArray/basic.m
+++ b/Tests/base/NSMutableArray/basic.m
@@ -9,6 +9,7 @@ int main()
   test_alloc(@"NSMutableArray");
   test_NSObject(@"NSMutableArray", [NSArray arrayWithObject:testObj]); 
   test_NSCoding([NSArray arrayWithObject:testObj]); 
+  test_keyed_NSCoding([NSArray arrayWithObject:testObj]); 
   test_NSCopying(@"NSArray",@"NSMutableArray", 
                  [NSArray arrayWithObject:testObj], NO, NO); 
   test_NSMutableCopying(@"NSArray",@"NSMutableArray", 
diff --git a/Tests/base/NSMutableAttributedString/basic.m b/Tests/base/NSMutableAttributedString/basic.m
index ae62110fe..400c6b44b 100644
--- a/Tests/base/NSMutableAttributedString/basic.m
+++ b/Tests/base/NSMutableAttributedString/basic.m
@@ -9,6 +9,7 @@ int main()
   test_alloc(@"NSMutableAttributedString");
   test_NSObject(@"NSMutableAttributedString", arr);
   test_NSCoding(arr);
+  test_keyed_NSCoding(arr);
   test_NSCopying(@"NSAttributedString",@"NSMutableAttributedString",arr,NO, NO);
   test_NSMutableCopying(@"NSAttributedString",@"NSMutableAttributedString",arr);
 
diff --git a/Tests/base/NSMutableDictionary/basic.m b/Tests/base/NSMutableDictionary/basic.m
index b863ce453..52667308a 100644
--- a/Tests/base/NSMutableDictionary/basic.m
+++ b/Tests/base/NSMutableDictionary/basic.m
@@ -12,6 +12,8 @@ int main()
   test_NSObject(@"NSMutableDictionary", [NSArray arrayWithObject:testObj]);
   
   test_NSCoding([NSArray arrayWithObject:testObj]);
+
+  test_keyed_NSCoding([NSArray arrayWithObject:testObj]);
   
   test_NSCopying(@"NSDictionary",@"NSMutableDictionary", 
                  [NSArray arrayWithObject:testObj], NO, NO);
diff --git a/Tests/base/NSMutableString/basic.m b/Tests/base/NSMutableString/basic.m
index 16ae42219..f4c54f795 100644
--- a/Tests/base/NSMutableString/basic.m
+++ b/Tests/base/NSMutableString/basic.m
@@ -75,6 +75,7 @@ int main()
   test_alloc(@"NSMutableString");
   testObj = [[NSMutableString alloc] initWithCString:"Hello\n"];
   test_NSCoding([NSArray arrayWithObject:testObj]);
+  test_keyed_NSCoding([NSArray arrayWithObject:testObj]);
   test_NSCopying(@"NSString",@"NSMutableString",
                  [NSArray arrayWithObject:testObj],NO,NO); 
   test_NSMutableCopying(@"NSString",@"NSMutableString",
diff --git a/Tests/base/NSSet/basic.m b/Tests/base/NSSet/basic.m
index f5e128290..60b0cd8c9 100644
--- a/Tests/base/NSSet/basic.m
+++ b/Tests/base/NSSet/basic.m
@@ -19,6 +19,7 @@ int main()
   
   test_NSObject(@"NSSet", testObjs);
   test_NSCoding(testObjs);
+  test_keyed_NSCoding(testObjs);
   test_NSCopying(@"NSSet", @"NSMutableSet", testObjs, YES, NO);
   test_NSMutableCopying(@"NSSet", @"NSMutableSet", testObjs);
   
diff --git a/Tests/base/NSSortDescriptor/basic.m b/Tests/base/NSSortDescriptor/basic.m
index eeeeac8e0..416456085 100644
--- a/Tests/base/NSSortDescriptor/basic.m
+++ b/Tests/base/NSSortDescriptor/basic.m
@@ -24,6 +24,7 @@ int main()
   array = [NSArray arrayWithObject: s1];
   test_NSObject(@"NSSortDescriptor", array);
   test_NSCoding(array);
+  test_keyed_NSCoding(array);
   test_NSCopying(@"NSSortDescriptor", @"NSSortDescriptor", array, NO, NO);
 
   s2 = [[NSSortDescriptor alloc] initWithKey: @"name" ascending: YES];
diff --git a/Tests/base/NSStream/basic.m b/Tests/base/NSStream/basic.m
index 079d68d40..ad1051bee 100644
--- a/Tests/base/NSStream/basic.m
+++ b/Tests/base/NSStream/basic.m
@@ -7,11 +7,13 @@ int main()
   NSAutoreleasePool   *arp = [NSAutoreleasePool new];
   NSInputStream *t1;
   NSOutputStream *t2;
+  NSArray *a;
   NSHost *host = [NSHost hostWithName:@"localhost"];
 
   [NSStream getStreamsToHost:host port:80 inputStream:&t1 outputStream:&t2];
 
-  test_NSObject(@"NSStream", [NSArray arrayWithObjects:t1, t2, nil]); 
+  a = [NSArray arrayWithObjects:t1, t2, nil]; 
+  test_NSObject(@"NSStream", a); 
 
   [arp release]; arp = nil;
   return 0;
diff --git a/Tests/base/NSString/basic.m b/Tests/base/NSString/basic.m
index 320fcb7f1..3e96ab2d7 100644
--- a/Tests/base/NSString/basic.m
+++ b/Tests/base/NSString/basic.m
@@ -14,6 +14,7 @@ int main()
   test_alloc(@"NSString");
   test_NSObject(@"NSString",[NSArray arrayWithObject:testObj]);
   test_NSCoding([NSArray arrayWithObject:testObj]);
+  test_keyed_NSCoding([NSArray arrayWithObject:testObj]);
   test_NSCopying(@"NSString", @"NSMutableString", 
                  [NSArray arrayWithObject:testObj], NO, NO);
   test_NSMutableCopying(@"NSString", @"NSMutableString",