--- trunk/t/02-frey-introspect.t	2008/07/08 16:18:39	65
+++ trunk/t/02-frey-introspect.t	2008/07/15 18:06:27	137
@@ -4,21 +4,28 @@
 
 my $debug = @ARGV ? 1 : 0;
 
-use Test::More tests => 66;
+use Test::More tests => 50;
 use lib 'lib';
 
 #use Devel::LeakTrace::Fast;
 use Data::Dump qw/dump/;
 
 BEGIN {
+	use_ok('Frey::ClassLoader');
 	use_ok('Frey::Introspect');
-	use_ok('Strix::User');
 	use_ok('Frey');
 }
 
-my $f = Frey->new;
+my $f = Frey::ClassLoader->new;
 
-foreach my $package ( map { warn dump( $_ ); keys %$_ } @{ $f->classes } ) {
+ok( my $classes = $f->classes, 'classes' );
+diag dump( $classes ) if $debug;
+
+ok( $f->classes, 'classes again' );
+
+my $more = 5;
+
+foreach my $package ( $f->classes ) {
 
 	ok( my $o = Frey::Introspect->new( debug => $debug, package => $package ), 'new' );
 	isa_ok( $o, 'Frey::Introspect' );
@@ -38,4 +45,6 @@
 
 	ok( my @methods = $o->methods, 'methods' );
 	diag dump( @methods ) if $debug;
+
+	last unless --$more;
 }