diff --git a/spec/factories/calendars.rb b/spec/factories/calendars.rb
index f5cafa0..f9282f8 100644
--- a/spec/factories/calendars.rb
+++ b/spec/factories/calendars.rb
@@ -4,5 +4,6 @@ FactoryGirl.define do
   factory :calendar do
     name "MyString"
     public false
+    association :rubrik, factory: :rubrik
   end
 end
diff --git a/spec/factories/calentries.rb b/spec/factories/calentries.rb
index 3e2d9b9..945d733 100644
--- a/spec/factories/calentries.rb
+++ b/spec/factories/calentries.rb
@@ -2,9 +2,12 @@
 
 FactoryGirl.define do
   factory :calentry do
-    start "2013-08-05 21:17:10"
+    start 1.hours.ago
     ende "2013-08-05 21:17:10"
     summary "MyString"
     typ 1
+    
+    association :calendar, factory: :calendar
   end
 end
+
diff --git a/spec/factories/meetings.rb b/spec/factories/meetings.rb
index ff6c4d2..5a19282 100644
--- a/spec/factories/meetings.rb
+++ b/spec/factories/meetings.rb
@@ -5,6 +5,16 @@ FactoryGirl.define do
     parent nil
     intern false
     meetingtyp nil
+#    association :calentry, factory: :calentry
+   
+    after(:build) do |c|
+      c.calentry=FactoryGirl.build(:calentry, typ: 2)
+   
+    end
+    
+#    trait :without_calentry do
+ #     calentry nil
+ #   end
   end
 
 end
diff --git a/spec/factories/meetingtyps.rb b/spec/factories/meetingtyps.rb
index 206530f..319e544 100644
--- a/spec/factories/meetingtyps.rb
+++ b/spec/factories/meetingtyps.rb
@@ -4,6 +4,7 @@ FactoryGirl.define do
     desc "MyText"
     agendaintern false
     protocolintern false
+    association :rubrik, factory: :rubrik
   end
 
 end
diff --git a/spec/factories/neuigkeit.rb b/spec/factories/neuigkeit.rb
index e6e3bba..03eb8d1 100644
--- a/spec/factories/neuigkeit.rb
+++ b/spec/factories/neuigkeit.rb
@@ -1,7 +1,24 @@
 FactoryGirl.define do
+  sequence (:title) {|n| "Wichtige Neuigkeit #{n}"}
+  sequence (:text) {|n|  "Wichtiger text #{n}"}
   factory :neuigkeit do
-    title "WIChtige Neuigkeit"
-    text "<p> Das ist eine wichtige Information </p>"
+    title 
+    text
     datum 1.days.ago
+    association :author, factory: :user
+    
+    trait :with_rubrik do
+      association :rubrik, factory: :rubrik, public: true
     end
+    trait :with_intern_rubrik do
+      association :rubrik, factory: :rubrik, public: false, name: "InterneRubrik"
+    end
+    trait :with_meeting do
+      association :meeting, factory: :meeting
+    end
+    trait :unpublished do
+      datum nil
+    end
+    
+  end
 end
diff --git a/spec/factories/rubrik.rb b/spec/factories/rubrik.rb
index b390be5..f1ccdbc 100644
--- a/spec/factories/rubrik.rb
+++ b/spec/factories/rubrik.rb
@@ -2,5 +2,6 @@ FactoryGirl.define do
   factory :rubrik do
     name "Allgemeine"
     desc "Allgemeine Test News"
-    end
+    public true
+  end
 end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index cc1ea5e..a0b3cb8 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,11 +1,18 @@
 FactoryGirl.define do  
+  sequence (:email) {|n| "testuser#{n}@fet.at"}
   factory :user do
-    email "testuser@test.at"
+    email
     password "password"
     password_confirmation "password"
     factory :other_user do
       email "othertest@test.at"
     end
+    trait :fetuser do 
+      after(:create) do |user|
+        user.after_create {|u| u.add_role("fetuser")}
+      end
+    end
+  end
+  
   end
-end