--- t/00-model-UnitMaterial.t	2007/12/06 12:53:30	26
+++ t/00-model-UnitMaterial.t	2007/12/06 16:57:13	27
@@ -8,34 +8,17 @@
 
 =cut
 
-use Jifty::Test tests => 20;
+use Jifty::Test tests => 16;
 
 # Make sure we can load the model
 use_ok('Arh::Model::UnitMaterial');
+use_ok('Arh::Test');
 
 # Grab a system user
 my $system_user = Arh::CurrentUser->superuser;
 ok($system_user, "Found a system user");
 
-ok(my $place = Arh::Model::Place->new, 'Place' );
-ok($place->create(
-	name => 'mjesto iskapanja',
-), 'create' );
-
-ok(my $campaign = Arh::Model::Campaign->new, 'Campaign' );
-ok($campaign->create(
-	place => $place,
-	name => 'prvo iskapanje',
-	date_from => '2007-11-28',
-	date_to => '2008-03-15',
-), 'create' );
-
-ok( my $unit = Arh::Model::Unit->new, 'Unit' );
-ok( $unit->create(
-	name => 'test unit',
-	inv_id => 42,
-	campaign => $campaign,
-), 'create' );
+ok( my $unit = Arh::Test->create_unit, 'unit' );
 
 ok( my $material = Arh::Model::Material->new, 'Material' );
 ok( $material->create(