diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index 092f2106a6..1ac4cf214b 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -1,50 +1,22 @@
---- 
-role_00002: 
+---
+role_00002:
   name: translator
-  created_at: 2008-11-09 03:26:02 Z
-  updated_at: 2008-11-09 03:26:02 Z
-  authorizable_type: 
   id: 2
-  authorizable_id: 
-role_00004: 
-  name: translator
-  created_at: 2009-06-27 18:59:55 Z
-  updated_at: 2009-06-27 18:59:55 Z
-  authorizable_type: Locale
-  id: 4
-  authorizable_id: 3
-role_00005: 
-  name: translator
-  created_at: 2009-06-27 18:59:55 Z
-  updated_at: 2009-06-27 18:59:55 Z
-  authorizable_type: Locale
-  id: 5
-  authorizable_id: 4
-role_00006: 
+role_00006:
   name: archivist
-  created_at: 2008-11-09 03:26:02 Z
-  updated_at: 2008-11-09 03:26:02 Z
-  authorizable_type: 
   id: 6
-  authorizable_id: 
-role_00001: 
+role_00001:
   name: tag_wrangler
-  created_at: 2008-11-09 03:26:02 Z
-  updated_at: 2008-11-09 03:26:02 Z
-  authorizable_type: 
   id: 1
-  authorizable_id: 
 role_00007:
   name: opendoors
-  created_at: 2008-11-09 03:26:02 Z
-  updated_at: 2008-11-09 03:26:02 Z
-  authorizable_type:
   id: 7
-  authorizable_id:
 role_00008:
   name: official
-  updated_at: 2021-04-21 14:27:00 Z
-  created_at: 2021-04-21 14:27:00 Z
-  authorizable_type:
   id: 8
-  authorizable_id:
+role_00009:
+  name: protected_user
+  id: 9
+role_00010:
+  name: no_resets
+  id: 10
diff --git a/test/fixtures/roles_users.yml b/test/fixtures/roles_users.yml
index 63940c7476..9e47bb837e 100644
--- a/test/fixtures/roles_users.yml
+++ b/test/fixtures/roles_users.yml
@@ -1,51 +1,36 @@
---- 
-join_00004: 
+---
+join_00004:
   created_at: 2009-06-27 18:59:55
   updated_at: 2009-06-27 18:59:55
-  role_id: "5"
+  role_id: "2"
   user_id: "2"
-join_00005: 
-  created_at: 
-  updated_at: 
+join_00005:
+  created_at:
+  updated_at:
   role_id: "1"
   user_id: "1"
-join_00006: 
-  created_at: 
-  updated_at: 
+join_00006:
+  created_at:
+  updated_at:
   role_id: "2"
   user_id: "1"
-join_00007: 
-  created_at: 2009-06-27 19:53:45
-  updated_at: 2009-06-27 19:53:45
-  role_id: "3"
-  user_id: "15"
-join_00008: 
+join_00008:
   created_at: 2008-11-09 04:26:02
   updated_at: 2008-11-09 04:26:02
   role_id: "1"
   user_id: "15"
-join_00009: 
+join_00009:
   created_at: 2008-11-09 03:26:02
   updated_at: 2008-11-09 03:26:02
   role_id: "2"
   user_id: "7"
-join_00000: 
+join_00000:
   created_at: 2008-11-09 03:26:02
   updated_at: 2008-11-09 03:26:02
   role_id: "1"
   user_id: "7"
-join_00001: 
+join_00001:
   created_at: 2009-06-27 18:59:55
   updated_at: 2009-06-27 18:59:55
   role_id: "6"
   user_id: "1"
-join_00002: 
-  created_at: 2009-06-27 18:53:45
-  updated_at: 2009-06-27 18:53:45
-  role_id: "3"
-  user_id: "1"
-join_00003: 
-  created_at: 2009-06-27 18:59:55
-  updated_at: 2009-06-27 18:59:55
-  role_id: "4"
-  user_id: "1"