diff --git a/.gitignore b/.gitignore
index ca65b9e95..3c04bc4db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ public/stylesheets/sessions.css
 public/stylesheets/ui.css
 public/stylesheets/mobile.css
 public/diaspora
-spec/fixtures/users.yaml
+spec/fixtures/*.yml
 
 # Uploded files and local files
 public/uploads/*
diff --git a/spec/fixtures/aspect_memberships.yml b/spec/fixtures/aspect_memberships.yml
deleted file mode 100644
index e2d5d3eb4..000000000
--- a/spec/fixtures/aspect_memberships.yml
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-aspect_memberships_002: 
-  created_at: 2011-01-18 22:45:18 Z
-  aspect_id: 1
-  updated_at: 2011-01-18 22:45:18 Z
-  contact_id: 2
-  id: 2
-aspect_memberships_003: 
-  created_at: 2011-01-18 22:45:18 Z
-  aspect_id: 2
-  updated_at: 2011-01-18 22:45:18 Z
-  contact_id: 3
-  id: 3
-aspect_memberships_004: 
-  created_at: 2011-01-18 22:45:18 Z
-  aspect_id: 3
-  updated_at: 2011-01-18 22:45:18 Z
-  contact_id: 4
-  id: 4
-aspect_memberships_001: 
-  created_at: 2011-01-18 22:45:18 Z
-  aspect_id: 2
-  updated_at: 2011-01-18 22:45:18 Z
-  contact_id: 1
-  id: 1
diff --git a/spec/fixtures/aspects.yml b/spec/fixtures/aspects.yml
deleted file mode 100644
index 5322d4d24..000000000
--- a/spec/fixtures/aspects.yml
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-generic_1: 
-  name: generic
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  updated_at: 2011-01-18 22:45:17 Z
-  id: 2
-  user_mongo_id: 
-  user_id: 2
-generic_2: 
-  name: generic
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  updated_at: 2011-01-18 22:45:18 Z
-  id: 3
-  user_mongo_id: 
-  user_id: 3
-generic: 
-  name: generic
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  updated_at: 2011-01-18 22:45:17 Z
-  id: 1
-  user_mongo_id: 
-  user_id: 1
diff --git a/spec/fixtures/comments.yml b/spec/fixtures/comments.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/comments.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/contacts.yml b/spec/fixtures/contacts.yml
deleted file mode 100644
index 402513b89..000000000
--- a/spec/fixtures/contacts.yml
+++ /dev/null
@@ -1,33 +0,0 @@
---- 
-contacts_003: 
-  pending: false
-  mongo_id: 
-  created_at: 2011-01-18 22:45:18 Z
-  updated_at: 2011-01-18 22:45:18 Z
-  id: 3
-  user_id: 2
-  person_id: 3
-contacts_004: 
-  pending: false
-  mongo_id: 
-  created_at: 2011-01-18 22:45:18 Z
-  updated_at: 2011-01-18 22:45:18 Z
-  id: 4
-  user_id: 3
-  person_id: 2
-contacts_001: 
-  pending: false
-  mongo_id: 
-  created_at: 2011-01-18 22:45:18 Z
-  updated_at: 2011-01-18 22:45:18 Z
-  id: 1
-  user_id: 2
-  person_id: 1
-contacts_002: 
-  pending: false
-  mongo_id: 
-  created_at: 2011-01-18 22:45:18 Z
-  updated_at: 2011-01-18 22:45:18 Z
-  id: 2
-  user_id: 1
-  person_id: 2
diff --git a/spec/fixtures/invitations.yml b/spec/fixtures/invitations.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/invitations.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_aspect_memberships.yml b/spec/fixtures/mongo_aspect_memberships.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_aspect_memberships.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_aspects.yml b/spec/fixtures/mongo_aspects.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_aspects.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_comments.yml b/spec/fixtures/mongo_comments.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_comments.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_contacts.yml b/spec/fixtures/mongo_contacts.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_contacts.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_invitations.yml b/spec/fixtures/mongo_invitations.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_invitations.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_notifications.yml b/spec/fixtures/mongo_notifications.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_notifications.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_people.yml b/spec/fixtures/mongo_people.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_people.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_post_visibilities.yml b/spec/fixtures/mongo_post_visibilities.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_post_visibilities.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_posts.yml b/spec/fixtures/mongo_posts.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_posts.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_profiles.yml b/spec/fixtures/mongo_profiles.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_profiles.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_requests.yml b/spec/fixtures/mongo_requests.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_requests.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_services.yml b/spec/fixtures/mongo_services.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_services.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/mongo_users.yml b/spec/fixtures/mongo_users.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/mongo_users.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/notifications.yml b/spec/fixtures/notifications.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/notifications.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/people.yml b/spec/fixtures/people.yml
deleted file mode 100644
index c0694a984..000000000
--- a/spec/fixtures/people.yml
+++ /dev/null
@@ -1,49 +0,0 @@
---- 
-people_001: 
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  guid: a26933a9a45ac375
-  updated_at: 2011-01-18 22:45:17 Z
-  url: http://google-1eac19e.com/
-  serialized_public_key: |
-    -----BEGIN RSA PUBLIC KEY-----
-    MIGJAoGBAKw1mMlExMJ9k5Q1E1EEPpmhqbFHdnxX7V5RIMKCwAgOq++SrzXlJfKv
-    nP11IK3CFZ1E+G/8H/MBf1insc9wQrjKQLlEN4UbeiPA2ahqAPApJ7PpyQBlaN4f
-    NjQyEm3M1QgdemiBzVYUZOU1gfkKpDoPPMIFgqKkl8O6ZJe6pcrfAgMBAAE=
-    -----END RSA PUBLIC KEY-----
-
-  owner_id: 1
-  id: 1
-  diaspora_handle: alice@example.org
-people_002: 
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  guid: d04ada2056f7202c
-  updated_at: 2011-01-18 22:45:17 Z
-  url: http://google-2542fc1.com/
-  serialized_public_key: |
-    -----BEGIN RSA PUBLIC KEY-----
-    MIGJAoGBAKw1mMlExMJ9k5Q1E1EEPpmhqbFHdnxX7V5RIMKCwAgOq++SrzXlJfKv
-    nP11IK3CFZ1E+G/8H/MBf1insc9wQrjKQLlEN4UbeiPA2ahqAPApJ7PpyQBlaN4f
-    NjQyEm3M1QgdemiBzVYUZOU1gfkKpDoPPMIFgqKkl8O6ZJe6pcrfAgMBAAE=
-    -----END RSA PUBLIC KEY-----
-
-  owner_id: 2
-  id: 2
-  diaspora_handle: bob@example.org
-people_003: 
-  mongo_id: 
-  created_at: 2011-01-18 22:45:18 Z
-  guid: 03637d1d38abd29d
-  updated_at: 2011-01-18 22:45:18 Z
-  url: http://google-3a77e5a.com/
-  serialized_public_key: |
-    -----BEGIN RSA PUBLIC KEY-----
-    MIGJAoGBAKw1mMlExMJ9k5Q1E1EEPpmhqbFHdnxX7V5RIMKCwAgOq++SrzXlJfKv
-    nP11IK3CFZ1E+G/8H/MBf1insc9wQrjKQLlEN4UbeiPA2ahqAPApJ7PpyQBlaN4f
-    NjQyEm3M1QgdemiBzVYUZOU1gfkKpDoPPMIFgqKkl8O6ZJe6pcrfAgMBAAE=
-    -----END RSA PUBLIC KEY-----
-
-  owner_id: 3
-  id: 3
-  diaspora_handle: eve@example.org
diff --git a/spec/fixtures/post_visibilities.yml b/spec/fixtures/post_visibilities.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/post_visibilities.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/posts.yml b/spec/fixtures/posts.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/posts.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/profiles.yml b/spec/fixtures/profiles.yml
deleted file mode 100644
index 6517a4f44..000000000
--- a/spec/fixtures/profiles.yml
+++ /dev/null
@@ -1,49 +0,0 @@
---- 
-profiles_001: 
-  image_url_medium: 
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  searchable: true
-  image_url: 
-  updated_at: 2011-01-18 22:45:17 Z
-  id: 1
-  gender: 
-  diaspora_handle: 
-  person_id: 1
-  last_name: Grimm12900f1
-  birthday: 
-  image_url_small: 
-  bio: 
-  first_name: Robert1459630
-profiles_002: 
-  image_url_medium: 
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  searchable: true
-  image_url: 
-  updated_at: 2011-01-18 22:45:17 Z
-  id: 2
-  gender: 
-  diaspora_handle: 
-  person_id: 2
-  last_name: Grimm2f63d16
-  birthday: 
-  image_url_small: 
-  bio: 
-  first_name: Robert26c81a0
-profiles_003: 
-  image_url_medium: 
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  searchable: true
-  image_url: 
-  updated_at: 2011-01-18 22:45:18 Z
-  id: 3
-  gender: 
-  diaspora_handle: 
-  person_id: 3
-  last_name: Grimm3f266bd
-  birthday: 
-  image_url_small: 
-  bio: 
-  first_name: Robert3938df3
diff --git a/spec/fixtures/requests.yml b/spec/fixtures/requests.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/requests.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/services.yml b/spec/fixtures/services.yml
deleted file mode 100644
index 20670d5f5..000000000
--- a/spec/fixtures/services.yml
+++ /dev/null
@@ -1,2 +0,0 @@
---- {}
-
diff --git a/spec/fixtures/users.yml b/spec/fixtures/users.yml
deleted file mode 100644
index ddea41d5e..000000000
--- a/spec/fixtures/users.yml
+++ /dev/null
@@ -1,121 +0,0 @@
---- 
-alice: 
-  encrypted_password: $2a$10$xbdc6ex5521gL/zGLbweNuF9echW6Q74L8sNu.Cug1e9fjBo2AZV6
-  serialized_private_key: |
-    -----BEGIN RSA PRIVATE KEY-----
-    MIICXgIBAAKBgQCsNZjJRMTCfZOUNRNRBD6ZoamxR3Z8V+1eUSDCgsAIDqvvkq81
-    5SXyr5z9dSCtwhWdRPhv/B/zAX9Yp7HPcEK4ykC5RDeFG3ojwNmoagDwKSez6ckA
-    ZWjeHzY0MhJtzNUIHXpogc1WFGTlNYH5CqQ6DzzCBYKipJfDumSXuqXK3wIDAQAB
-    AoGBAJt8pSANBG7q/WYS6gb7gx4p9lKHyLaKmVrQe3jEn2hm/t0IH0TVSocuAtxi
-    dggNNoDSdlJ+XcaGspm0h/pZTROa05er055twa4JxdwFTxGpv6pBgV56TXugzsYD
-    fF+pQQmfSl0TZ7nTL1DHWlGufrBUyOQ0cevcEvwlzUCdkhHpAkEA1+QVzevb0rCf
-    jf4GOG/D9PrgJBPtkhglxm81deQntfkfaNZLkMGEds41REijiEoftOPEdHt7Porq
-    sQuGdCTZ0wJBAMwz/InrGxlTxLky1dcZd+2DJCQks2OFBnyzf0kamN7KoEBv0K/w
-    yX/1C0JFu6h/6UTe9E+k4Xfnzhm+K9byd0UCQQDPlvDkbbuU7uKtHSqMD+Qj5yup
-    ZUQWK4P/N6X3MyiAEQkDvLMygPHHb2bGvvYIMgYk4LJhsu6B5//dt5BUk66jAkBy
-    aSIyZ+6r9xo+pXPYa6WdBqAGPCXiOZMT5UIIxIUoNqEo2T00hpVvQu1G+WkWFGyv
-    MLfzs668Dr2UAM/xQ7J9AkEAoR9VaZemxV8thA+w8EeIeBWjAjFY2kZJpPJIQIEv
-    VtOzYCHm0WXjuyyKHY9AOPLEO9RB4XXW0qmtE28kUCMXGw==
-    -----END RSA PRIVATE KEY-----
-
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  updated_at: 2011-01-18 22:45:17 Z
-  last_sign_in_ip: 
-  invites: 0
-  username: alice
-  last_sign_in_at: 
-  language: en
-  sign_in_count: 0
-  id: 1
-  disable_mail: false
-  password_salt: $2a$10$xbdc6ex5521gL/zGLbweNu
-  reset_password_token: 
-  remember_token: 
-  current_sign_in_ip: 
-  remember_created_at: 
-  current_sign_in_at: 
-  invitation_sent_at: 
-  invitation_token: 
-  getting_started: true
-  email: bob1810d2e@pivotallabs.com
-eve: 
-  encrypted_password: $2a$10$MunrAlmGUbgmhg0gYo/cqOPm5ObMjHA/rWsSVZiKD1ue0yFQ2AGbO
-  serialized_private_key: |
-    -----BEGIN RSA PRIVATE KEY-----
-    MIICXgIBAAKBgQCsNZjJRMTCfZOUNRNRBD6ZoamxR3Z8V+1eUSDCgsAIDqvvkq81
-    5SXyr5z9dSCtwhWdRPhv/B/zAX9Yp7HPcEK4ykC5RDeFG3ojwNmoagDwKSez6ckA
-    ZWjeHzY0MhJtzNUIHXpogc1WFGTlNYH5CqQ6DzzCBYKipJfDumSXuqXK3wIDAQAB
-    AoGBAJt8pSANBG7q/WYS6gb7gx4p9lKHyLaKmVrQe3jEn2hm/t0IH0TVSocuAtxi
-    dggNNoDSdlJ+XcaGspm0h/pZTROa05er055twa4JxdwFTxGpv6pBgV56TXugzsYD
-    fF+pQQmfSl0TZ7nTL1DHWlGufrBUyOQ0cevcEvwlzUCdkhHpAkEA1+QVzevb0rCf
-    jf4GOG/D9PrgJBPtkhglxm81deQntfkfaNZLkMGEds41REijiEoftOPEdHt7Porq
-    sQuGdCTZ0wJBAMwz/InrGxlTxLky1dcZd+2DJCQks2OFBnyzf0kamN7KoEBv0K/w
-    yX/1C0JFu6h/6UTe9E+k4Xfnzhm+K9byd0UCQQDPlvDkbbuU7uKtHSqMD+Qj5yup
-    ZUQWK4P/N6X3MyiAEQkDvLMygPHHb2bGvvYIMgYk4LJhsu6B5//dt5BUk66jAkBy
-    aSIyZ+6r9xo+pXPYa6WdBqAGPCXiOZMT5UIIxIUoNqEo2T00hpVvQu1G+WkWFGyv
-    MLfzs668Dr2UAM/xQ7J9AkEAoR9VaZemxV8thA+w8EeIeBWjAjFY2kZJpPJIQIEv
-    VtOzYCHm0WXjuyyKHY9AOPLEO9RB4XXW0qmtE28kUCMXGw==
-    -----END RSA PRIVATE KEY-----
-
-  mongo_id: 
-  created_at: 2011-01-18 22:45:18 Z
-  updated_at: 2011-01-18 22:45:18 Z
-  last_sign_in_ip: 
-  invites: 0
-  username: eve
-  last_sign_in_at: 
-  language: en
-  sign_in_count: 0
-  id: 3
-  disable_mail: false
-  password_salt: $2a$10$MunrAlmGUbgmhg0gYo/cqO
-  reset_password_token: 
-  remember_token: 
-  current_sign_in_ip: 
-  remember_created_at: 
-  current_sign_in_at: 
-  invitation_sent_at: 
-  invitation_token: 
-  getting_started: true
-  email: bob3d6acb8@pivotallabs.com
-bob: 
-  encrypted_password: $2a$10$O07zBbVmaUpAyLo6nBmOAur5BcrXLmb5kKRrx2eX04qo3Bi0uXWfu
-  serialized_private_key: |
-    -----BEGIN RSA PRIVATE KEY-----
-    MIICXgIBAAKBgQCsNZjJRMTCfZOUNRNRBD6ZoamxR3Z8V+1eUSDCgsAIDqvvkq81
-    5SXyr5z9dSCtwhWdRPhv/B/zAX9Yp7HPcEK4ykC5RDeFG3ojwNmoagDwKSez6ckA
-    ZWjeHzY0MhJtzNUIHXpogc1WFGTlNYH5CqQ6DzzCBYKipJfDumSXuqXK3wIDAQAB
-    AoGBAJt8pSANBG7q/WYS6gb7gx4p9lKHyLaKmVrQe3jEn2hm/t0IH0TVSocuAtxi
-    dggNNoDSdlJ+XcaGspm0h/pZTROa05er055twa4JxdwFTxGpv6pBgV56TXugzsYD
-    fF+pQQmfSl0TZ7nTL1DHWlGufrBUyOQ0cevcEvwlzUCdkhHpAkEA1+QVzevb0rCf
-    jf4GOG/D9PrgJBPtkhglxm81deQntfkfaNZLkMGEds41REijiEoftOPEdHt7Porq
-    sQuGdCTZ0wJBAMwz/InrGxlTxLky1dcZd+2DJCQks2OFBnyzf0kamN7KoEBv0K/w
-    yX/1C0JFu6h/6UTe9E+k4Xfnzhm+K9byd0UCQQDPlvDkbbuU7uKtHSqMD+Qj5yup
-    ZUQWK4P/N6X3MyiAEQkDvLMygPHHb2bGvvYIMgYk4LJhsu6B5//dt5BUk66jAkBy
-    aSIyZ+6r9xo+pXPYa6WdBqAGPCXiOZMT5UIIxIUoNqEo2T00hpVvQu1G+WkWFGyv
-    MLfzs668Dr2UAM/xQ7J9AkEAoR9VaZemxV8thA+w8EeIeBWjAjFY2kZJpPJIQIEv
-    VtOzYCHm0WXjuyyKHY9AOPLEO9RB4XXW0qmtE28kUCMXGw==
-    -----END RSA PRIVATE KEY-----
-
-  mongo_id: 
-  created_at: 2011-01-18 22:45:17 Z
-  updated_at: 2011-01-18 22:45:17 Z
-  last_sign_in_ip: 
-  invites: 0
-  username: bob
-  last_sign_in_at: 
-  language: en
-  sign_in_count: 0
-  id: 2
-  disable_mail: false
-  password_salt: $2a$10$O07zBbVmaUpAyLo6nBmOAu
-  reset_password_token: 
-  remember_token: 
-  current_sign_in_ip: 
-  remember_created_at: 
-  current_sign_in_at: 
-  invitation_sent_at: 
-  invitation_token: 
-  getting_started: true
-  email: bob2532cbe@pivotallabs.com