diff --git a/Tests/base/coding/BOOL-1.type b/Tests/base/coding/BOOL-1.type
deleted file mode 100644
index 856c02bd2..000000000
Binary files a/Tests/base/coding/BOOL-1.type and /dev/null differ
diff --git a/Tests/base/coding/BOOL-4.type b/Tests/base/coding/BOOL-4.type
new file mode 100644
index 000000000..78fcd4b6b
Binary files /dev/null and b/Tests/base/coding/BOOL-4.type differ
diff --git a/Tests/base/coding/basictypes.m b/Tests/base/coding/basictypes.m
index 01789f1fa..6291621e4 100644
--- a/Tests/base/coding/basictypes.m
+++ b/Tests/base/coding/basictypes.m
@@ -114,15 +114,10 @@ void testReadBasicType_##testName (char *pre, testType *expect, testType *toDeco
   NSData *data; \
   NSUnarchiver *unArch; \
   NSString *str2; \
-  NSArray *encodedFiles; \
-  NSString *prefix = [[NSString stringWithCString:pre] retain]; \
-  unsigned int i, c; \
-  encodedFiles = [[NSBundle bundleWithPath: [fm currentDirectoryPath]] \
-	  		pathsForResourcesOfType:@"type" inDirectory:nil]; \
-  for (i = 0, c = [encodedFiles count]; i < c; i++) \
-    { \
-      NSString *fileName = [encodedFiles objectAtIndex:i]; \
-      if ([[fileName lastPathComponent] hasPrefix:prefix]) \
+  NSString *fileName; \
+  long typeSize = sizeof(testType); \
+  fileName = [[NSString stringWithFormat:@"%s-%li.type",pre,typeSize] retain]; \
+  if ([fm isReadableFileAtPath:fileName]) \
 	{ \
 	  data = [NSData dataWithContentsOfFile:fileName]; \
 	  unArch = [[NSUnarchiver alloc] initForReadingWithData:data]; \
@@ -136,7 +131,10 @@ void testReadBasicType_##testName (char *pre, testType *expect, testType *toDeco
 	  PASS((VAL_TEST(*expect,*toDecode) && [str isEqual:str2]), \
 		"can unarchive %s from %s", pre, [fileName UTF8String]); \
 	} \
-    } \
+  else \
+  { \
+    PASS(1 == 2, "Archive %s not found.", [fileName UTF8String]); \
+  } \
 } 
 
 #define VAL_TEST(testX,testY) testX == testY
diff --git a/Tests/base/coding/double-8.type b/Tests/base/coding/double-8.type
index 9623fc75c..cc4332d80 100644
Binary files a/Tests/base/coding/double-8.type and b/Tests/base/coding/double-8.type differ
diff --git a/Tests/base/coding/float-4.type b/Tests/base/coding/float-4.type
index 418e1f8af..a888d6ea7 100644
Binary files a/Tests/base/coding/float-4.type and b/Tests/base/coding/float-4.type differ
diff --git a/Tests/base/coding/int-4.type b/Tests/base/coding/int-4.type
index d5e553094..ac6c93e1e 100644
Binary files a/Tests/base/coding/int-4.type and b/Tests/base/coding/int-4.type differ
diff --git a/Tests/base/coding/llong-8.type b/Tests/base/coding/llong-8.type
index d29b0874b..35e6ac4eb 100644
Binary files a/Tests/base/coding/llong-8.type and b/Tests/base/coding/llong-8.type differ
diff --git a/Tests/base/coding/long-4.type b/Tests/base/coding/long-4.type
index 74997a342..5bd50f003 100644
Binary files a/Tests/base/coding/long-4.type and b/Tests/base/coding/long-4.type differ
diff --git a/Tests/base/coding/schar-1.type b/Tests/base/coding/schar-1.type
index 06767dff0..446fd5646 100644
Binary files a/Tests/base/coding/schar-1.type and b/Tests/base/coding/schar-1.type differ
diff --git a/Tests/base/coding/short-2.type b/Tests/base/coding/short-2.type
index 43dd823f3..7e2bc2bdd 100644
Binary files a/Tests/base/coding/short-2.type and b/Tests/base/coding/short-2.type differ
diff --git a/Tests/base/coding/uchar-1.type b/Tests/base/coding/uchar-1.type
index 8d55b81df..7a709940a 100644
Binary files a/Tests/base/coding/uchar-1.type and b/Tests/base/coding/uchar-1.type differ
diff --git a/Tests/base/coding/uint-4.type b/Tests/base/coding/uint-4.type
index e52883098..5a87d7cd3 100644
Binary files a/Tests/base/coding/uint-4.type and b/Tests/base/coding/uint-4.type differ
diff --git a/Tests/base/coding/ullong-8.type b/Tests/base/coding/ullong-8.type
index 88c25ff93..50516c26d 100644
Binary files a/Tests/base/coding/ullong-8.type and b/Tests/base/coding/ullong-8.type differ
diff --git a/Tests/base/coding/ulong-4.type b/Tests/base/coding/ulong-4.type
index a54ee85a4..b8dd564b0 100644
Binary files a/Tests/base/coding/ulong-4.type and b/Tests/base/coding/ulong-4.type differ
diff --git a/Tests/base/coding/ushort-2.type b/Tests/base/coding/ushort-2.type
index cf67a193f..701012f51 100644
Binary files a/Tests/base/coding/ushort-2.type and b/Tests/base/coding/ushort-2.type differ