--- t/00-model-Picture.t	2007/11/29 11:20:24	4
+++ t/00-model-Picture.t	2007/12/10 14:56:12	28
@@ -12,29 +12,19 @@
 
 # Make sure we can load the model
 use_ok('Arh::Model::Picture');
+use_ok('Arh::Test');
 
 # Grab a system user
 my $system_user = Arh::CurrentUser->superuser;
 ok($system_user, "Found a system user");
 
-my $place = Arh::Model::Place->new(current_user => $system_user);
-ok( $place->create(
-	name => 'mjesto iskapanja',
-), "Place create returned success");
-
-my $campaign = Arh::Model::Campaign->new(current_user => $system_user);
-ok( $campaign->create(
-	name => 'prvo iskapanje',
-	date_from => '2007-11-28',
-	date_to => '2008-03-15',
-	place => $place,
-), "Campaign create returned success");
-
 my $type = Arh::Model::PictureType->new(current_user => $system_user);
 ok( $type->create(
 	name => 'slika',
 ), "PictureType create returned success");
 
+ok( my $campaign = Arh::Test->Campaign, 'Campaign' );
+
 # Try testing a create
 my $o = Arh::Model::Picture->new(current_user => $system_user);
 my ($id) = $o->create(