@@ -85,22 +85,22 @@
 
 	TEST(@"-[replaceObject:identicalTo:]",
 	    R([m[0] replaceObjectIdenticalTo: c_ary[0]
 				  withObject: c_ary[1]]) &&
 	    [[m[0] objectAtIndex: 0] isEqual: c_ary[1]] &&
-	    [[m[0] objectAtIndex: 1] isEqual: c_ary[1]] &&
+	    [[m[0] objectAtIndex: 1] isEqual: c_ary[0]] &&
 	    [[m[0] objectAtIndex: 2] isEqual: c_ary[2]])
 
 	TEST(@"-[replaceObjectAtIndex:withObject:]",
-	    [m[0] replaceObjectAtIndex: 0
-			    withObject: c_ary[0]] &&
+	    R([m[0] replaceObjectAtIndex: 0
+			      withObject: c_ary[0]]) &&
 	    [[m[0] objectAtIndex: 0] isEqual: c_ary[0]] &&
-	    [[m[0] objectAtIndex: 1] isEqual: c_ary[1]] &&
+	    [[m[0] objectAtIndex: 1] isEqual: c_ary[0]] &&
 	    [[m[0] objectAtIndex: 2] isEqual: c_ary[2]])
 
 	TEST(@"-[removeObject:]",
-	    R([m[0] removeObject: c_ary[1]]) && [m[0] count] == 2)
+	    R([m[0] removeObject: c_ary[0]]) && [m[0] count] == 2)
 
 	TEST(@"-[removeObjectIdenticalTo:]",
 	    R([m[0] removeObjectIdenticalTo: c_ary[2]]) && [m[0] count] == 1)
 
 	[m[0] addObject: c_ary[0]];
@@ -107,11 +107,11 @@
 	[m[0] addObject: c_ary[1]];
 	TEST(@"-[removeNObjects:]", R([m[0] removeNObjects: 2]) &&
 	    [m[0] count] == 1 && [[m[0] objectAtIndex: 0] isEqual: c_ary[0]])
 
 	m[1] = [[a[0] mutableCopy] autorelease];
-	TEST(@"-[removeObjectAtIndex:]", [m[1] removeObjectAtIndex: 1] &&
+	TEST(@"-[removeObjectAtIndex:]", R([m[1] removeObjectAtIndex: 1]) &&
 	    [m[1] count] == 2 && [[m[1] objectAtIndex: 1] isEqual: c_ary[2]])
 
 	m[1] = [[a[0] mutableCopy] autorelease];
 	TEST(@"-[removeNObjects:atIndex:]", R([m[1] removeNObjects: 2
 							   atIndex: 0]) &&