--- trunk/t/05-frey-dumper.t	2008/11/05 08:20:59	287
+++ trunk/t/05-frey-dumper.t	2008/11/19 18:55:19	464
@@ -4,17 +4,26 @@
 
 my $debug = @ARGV ? 1 : 0;
 
-use Test::More tests => 4;
+use Test::More tests => 6;
 use lib 'lib';
 
 use Data::Dump qw/dump/;
 
+sub class { 'Frey::Dumper' }
+
 BEGIN {
-	use_ok('Frey::Dumper');
+	use_ok( class );
+	use_ok('Frey::ClassLoader');
 }
 
-ok( my $o = Frey::Dumper->new( data => { foo => 'bar' } ), 'new' );
-ok( my $markup = $o->markup, 'markup' );
+my $param = {
+	debug => $debug,
+	data => { foo => 'bar' },
+};
+
+ok( my $o = Frey::ClassLoader->new_frey_class( class, $param ), 'new' );
+ok( my $markup = $o->as_markup, 'markup' );
 diag $markup if $debug;
 like( $markup, qr/foo.*bar/, 'correct' );
+is_deeply( $o->as_data, $param->{data}, 'as_data' );