@@ -121,15 +121,10 @@
 	    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]];
-	[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:]", R([m[1] removeObjectAtIndex: 1]) &&
 	    [m[1] count] == 2 && [[m[1] objectAtIndex: 1] isEqual: c_ary[2]])
 
 	m[1] = [[a[0] mutableCopy] autorelease];
@@ -159,12 +154,13 @@
 	    @"0", @"Bar", @"Baz", @"Foo", @"z", nil])])
 
 	EXPECT_EXCEPTION(@"Detect out of range in -[objectAtIndex:]",
 	    OFOutOfRangeException, [a[0] objectAtIndex: [a[0] count]])
 
-	EXPECT_EXCEPTION(@"Detect out of range in -[removeNObjects:]",
-	    OFOutOfRangeException, [m[0] removeNObjects: [m[0] count] + 1])
+	EXPECT_EXCEPTION(@"Detect out of range in -[removeObjectsInRange:]",
+	    OFOutOfRangeException, [m[0] removeObjectsInRange:
+		of_range(0, [m[0] count] + 1)])
 
 	TEST(@"-[componentsJoinedByString:]",
 	    (a[1] = [OFArray arrayWithObjects: @"foo", @"bar", @"baz", nil]) &&
 	    [[a[1] componentsJoinedByString: @" "] isEqual: @"foo bar baz"] &&
 	    (a[1] = [OFArray arrayWithObject: @"foo"]) &&
@@ -232,11 +228,11 @@
 		ok = YES;
 	}
 
 	TEST(@"Detection of mutation during Fast Enumeration", ok)
 
-	[m[0] removeNObjects: 1];
+	[m[0] removeLastObject];
 #endif
 
 #ifdef OF_HAVE_BLOCKS
 	{
 		__block BOOL ok = YES;