diff --git a/swh/indexer/tests/utils.py b/swh/indexer/tests/utils.py
--- a/swh/indexer/tests/utils.py
+++ b/swh/indexer/tests/utils.py
@@ -36,38 +36,24 @@
 
 ORIGINS = [
         {
-            'lister': None,
-            'project': None,
             'type': 'git',
             'url': 'https://github.com/SoftwareHeritage/swh-storage'},
         {
-            'lister': None,
-            'project': None,
             'type': 'ftp',
             'url': 'rsync://ftp.gnu.org/gnu/3dldf'},
         {
-            'lister': None,
-            'project': None,
             'type': 'deposit',
             'url': 'https://forge.softwareheritage.org/source/jesuisgpl/'},
         {
-            'lister': None,
-            'project': None,
             'type': 'pypi',
             'url': 'https://pypi.org/project/limnoria/'},
         {
-            'lister': None,
-            'project': None,
             'type': 'svn',
             'url': 'http://0-512-md.googlecode.com/svn/'},
         {
-            'lister': None,
-            'project': None,
             'type': 'git',
             'url': 'https://github.com/librariesio/yarn-parser'},
         {
-            'lister': None,
-            'project': None,
             'type': 'git',
             'url': 'https://github.com/librariesio/yarn-parser.git'},
         ]
@@ -111,7 +97,7 @@
             b'3DLDF-2.0.tar.gz': {
                 'target': b'F6*\xff(?\x19a\xef\xb6\xc2\x1fv$S\xe3G'
                           b'\xd3\xd1m',
-                b'target_type': 'revision'}
+                'target_type': 'revision'}
             }},
     {
         'origin': 'https://forge.softwareheritage.org/source/jesuisgpl/',
@@ -167,18 +153,23 @@
 
 REVISIONS = [{
     'id': hash_to_bytes('8dbb6aeb036e7fd80664eb8bfd1507881af1ba9f'),
+    'message': 'Improve search functionality',
     'author': {
-        'id': 26,
         'name': b'Andrew Nesbitt',
         'fullname': b'Andrew Nesbitt <andrewnez@gmail.com>',
         'email': b'andrewnez@gmail.com'
     },
     'committer': {
-        'id': 26,
         'name': b'Andrew Nesbitt',
         'fullname': b'Andrew Nesbitt <andrewnez@gmail.com>',
         'email': b'andrewnez@gmail.com'
     },
+    'committer_date': {
+        'negative_utc': None,
+        'offset': 120,
+        'timestamp': {'microseconds': 0, 'seconds': 1380883849}
+    },
+    'type': 'git',
     'synthetic': False,
     'date': {
         'negative_utc': False,
@@ -194,35 +185,22 @@
 DIRECTORY_ID = b'10'
 
 DIRECTORY = [{
-    'sha1_git': b'abc',
     'name': b'index.js',
-    'target': b'abc',
-    'length': 897,
-    'status': 'visible',
     'type': 'file',
+    'target': b'abc',
     'perms': 33188,
-    'sha1': b'bcd'
     },
     {
-    'sha1_git': b'aab',
     'name': b'package.json',
-    'target': b'aab',
-    'length': 712,
-    'status': 'visible',
     'type': 'file',
+    'target': b'aab',
     'perms': 33188,
-    'sha1': b'cde'
     },
     {
-    'target': b'11',
-    'type': 'dir',
-    'length': None,
     'name': b'.github',
-    'sha1': None,
+    'type': 'dir',
+    'target': b'11',
     'perms': 16384,
-    'sha1_git': None,
-    'status': None,
-    'sha256': None
     }
 ]