diff --git a/spec/blueprints.rb b/spec/blueprints.rb
index 91f2e885..db7b917c 100644
--- a/spec/blueprints.rb
+++ b/spec/blueprints.rb
@@ -11,21 +11,29 @@
 State.blueprint do
   country {Country.make}
   name {Sham.generic_name}
-  code {Sham.code}
+  code
 end
 
 Country.blueprint do
   name {Sham.generic_name}
-  code {Sham.code}
+  code
 end
 
 Calendar.blueprint do
   name {Sham.calendar_name}
 end
 
+User.blueprint do
+  email
+  password
+  password_confirmation {self.password}
+end
+
 Sham.define do
   calendar_name {Faker::Name.name + "'s calendar"}
+  email {Faker::Internet.email}
   generic_name {Faker::Name.last_name}
+  password {(1..(rand(15) + 2)).map{(32..127).to_a.rand.chr}.join}
   code {LETTERS.rand + LETTERS.rand} # 2 random letters
   event_name {Faker::Lorem.words(3).join(' ')}
 end
\ No newline at end of file
diff --git a/spec/helpers/events_helper_spec.rb b/spec/helpers/events_helper_spec.rb
index bf565d57..895033c7 100644
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
@@ -52,7 +52,7 @@
   end
   
   it "should generate a distance string from an event to a user's coords," do
-    marnen = users(:marnen)
+    marnen = User.make(:coords => Point.from_x_y(5, 10)) # arbitrary coordinates
     @event.coords = marnen.coords
     helper.distance_string(@event, marnen).should =~ /\D\d(\.\d+)? miles/
     user = User.new