--- trunk/t/3-normalize.t	2007/10/30 17:40:13	912
+++ trunk/t/3-normalize.t	2007/11/01 00:16:48	949
@@ -1,25 +1,15 @@
 #!/usr/bin/perl -w
 
 use strict;
-
-use Test::More tests => 341;
-use Test::Exception;
-use Cwd qw/abs_path/;
 use blib;
-use File::Slurp;
-use Getopt::Long;
+
+use Test::More tests => 347;
 
 BEGIN {
+	use_ok( 'WebPAC::Test' );
 	use_ok( 'WebPAC::Normalize' );
 }
 
-use Data::Dump qw/dump/;
-
-my $debug = 0;
-GetOptions(
-	"debug+", \$debug
-);
-
 cmp_ok(_debug(1), '==', 1, '_debug level');
 cmp_ok(_debug(0), '==', 0, '_debug level');
 
@@ -28,10 +18,6 @@
 	diag "debug level for WebPAC::Normalize is ", _debug( $debug - 2 );
 }
 
-ok(my $abs_path = abs_path($0), "abs_path");
-$abs_path =~ s#/[^/]*$#/#;
-diag "abs_path: $abs_path" if ($debug);
-
 my $rec1 = {
 	'200' => [{
 		'a' => '200a',
@@ -437,6 +423,11 @@
 	test_check_ds('display');
 
 	_clean_ds();
+	test_s(qq{ sorted('something', '42'); });
+	test_s(qq{ sorted('empty', ''); });
+	test_check_ds('sorted');
+
+	_clean_ds();
 	my $n = read_file( "$abs_path/data/normalize.pl" );
 	$n .= "\n1;\n";
 	#diag "normalize code:\n$n\n";