--- trunk/t/3-normalize.t	2006/10/02 09:31:25	735
+++ trunk/t/3-normalize.t	2006/10/05 12:57:51	736
@@ -196,20 +196,20 @@
 
 	# lookups
 
-	throws_ok { _set_load_ds() } qr/CODE/, 'empty _set_load_ds()';
+	throws_ok { _set_load_row() } qr/CODE/, 'empty _set_load_row()';
 
-	ok(_set_load_ds(sub {
+	ok(_set_load_row(sub {
 		my ($database,$input,$mfn) = @_;
-		diag "load_ds( $database, $input, $mfn )";
+		diag "load_row( $database, $input, $mfn )";
 		cmp_ok( $#_, '==', 2, 'have 3 arguments');
-		ok($database, '_load_ds database');
-		ok($input, '_load_ds input');
-		ok($mfn, '_load_ds mfn');
+		ok($database, '_load_row database');
+		ok($input, '_load_row input');
+		ok($mfn, '_load_row mfn');
 		return {
 			'900' => [{ x => '900x-' . $mfn , y => '900y-' . $mfn }],
 		}
 
-	}), '_set_load_ds');
+	}), '_set_load_row');
 
 	my @v = qw/foo bar baz aaa bbb ccc ddd/;
 
@@ -233,7 +233,7 @@
 
 		my @lookup;
 
-		ok(my @lookup = lookup(
+		ok(@lookup = lookup(
 				sub {
 					diag "in show";
 					rec('900','x');
@@ -277,17 +277,17 @@
 	diag "lookup_hash1 = ", dump($lookup_hash1);
 	ok(_set_lookup( $lookup_hash1 ), '_set_lookup $lookup_hash1');
 
-	throws_ok { _set_load_ds() } qr/CODE/, 'empty _set_load_ds()';
+	throws_ok { _set_load_row() } qr/CODE/, 'empty _set_load_row()';
 
-	ok(_set_load_ds(sub {
+	ok(_set_load_row(sub {
 		my ($database,$input,$mfn) = @_;
-		diag "load_ds( $database, $input, $mfn )";
+		diag "load_row( $database, $input, $mfn )";
 		cmp_ok( $#_, '==', 2, 'have 3 arguments');
 		ok($database, 'database');
 		ok($input, 'input');
 		ok($mfn, 'mfn');
 
-	}), '_set_load_ds');
+	}), '_set_load_row');
 
 
 #	cmp_ok(lookup(