@@ -237,11 +237,11 @@
 	[m[1] addObject: @"z"];
 	TEST(@"-[sortedArray]",
 	    [[m[1] sortedArray] isEqual: [arrayClass arrayWithObjects:
 	    @"0", @"Bar", @"Baz", @"Foo", @"z", nil]] &&
 	    [[m[1] sortedArrayUsingSelector: @selector(compare:)
-				    options: OF_ARRAY_SORT_DESCENDING]
+				    options: OFArraySortDescending]
 	    isEqual: [arrayClass arrayWithObjects:
 	    @"z", @"Foo", @"Baz", @"Bar", @"0", nil]])
 
 	EXPECT_EXCEPTION(@"Detect out of range in -[objectAtIndex:]",
 	    OFOutOfRangeException, [a[0] objectAtIndex: a[0].count])
@@ -257,12 +257,13 @@
 	    (a[1] = [arrayClass arrayWithObject: @"foo"]) &&
 	    [[a[1] componentsJoinedByString: @" "] isEqual: @"foo"])
 
 	TEST(@"-[componentsJoinedByString:options]",
 	    (a[1] = [arrayClass arrayWithObjects: @"", @"foo", @"", @"", @"bar",
-	    @"", nil]) && [[a[1] componentsJoinedByString: @" "
-						  options: OF_ARRAY_SKIP_EMPTY]
+	    @"", nil]) &&
+	    [[a[1] componentsJoinedByString: @" "
+				    options: OFArraySkipEmptyComponents]
 	    isEqual: @"foo bar"])
 
 	m[0] = [[a[0] mutableCopy] autorelease];
 	ok = true;
 	i = 0;