--- t/00-model-User.t	2008/03/30 15:23:35	41
+++ t/00-model-User.t	2008/03/30 16:58:21	42
@@ -8,7 +8,7 @@
 
 =cut
 
-use Jifty::Test tests => 12;
+use Jifty::Test tests => 11;
 
 # Make sure we can load the model
 use_ok('A3C::Model::User');
@@ -17,14 +17,18 @@
 my $system_user = A3C::CurrentUser->superuser;
 ok($system_user, "Found a system user");
 
+my $id;
+
+=for later
 my $organization = A3C::Model::Organization->new(current_user => $system_user);
-my ($id) = $organization->create(
+($id) = $organization->create(
 	o => 'CARNet',
 	hrEduPersonHomeOrg => 'skole.hr',
 	postalAddress => 'Pere Perica b.b.',
 	l => 'Zagreb',
 );
 ok($id, "Organization create returned success");
+=cut
 
 # Try testing a create
 my $o = A3C::Model::User->new(current_user => $system_user);
@@ -37,7 +41,8 @@
 	cn => 'Foo Bar',
 	hrEduPersonUniqueNumber => 42,
 	hrEduPersonAffiliation => 'suradnik',
-	organization => $organization,
+	hrEduPersonHomeOrg => 'skole.hr',
+#	organization => $organization,
 );
 ok($id, "User create returned success");
 ok($o->id, "New User has valid id set");
@@ -53,7 +58,8 @@
 	cn => 'Bary Fooby',
 	hrEduPersonUniqueNumber => 1001,
 	hrEduPersonAffiliation => 'gost',
-	organization => $organization,
+	hrEduPersonHomeOrg => 'skole.hr',
+#	organization => $organization,
 );
 ok($o->id, "User create returned another value");
 isnt($o->id, $id, "And it is different from the previous one");