diff --git a/tests/Foundation/Entries/EntriesTest.php b/tests/Foundation/Entries/EntriesTest.php
index c30910636..6d4ff40fd 100644
--- a/tests/Foundation/Entries/EntriesTest.php
+++ b/tests/Foundation/Entries/EntriesTest.php
@@ -33,9 +33,9 @@
     entries()->create('foo/baz', ['title' => 'Baz']);
     entries()->create('foo/zed', ['title' => 'Zed']);
 
-    $this->assertEquals(12, entries()->fetch('foo')->count());
+    $this->assertEquals(11, entries()->fetch('foo')->count());
     $this->assertEquals('foo', entries()->fetch('foo')['id']);
-    $this->assertEquals(12, entries()->fetch('foo', [])->count());
+    $this->assertEquals(11, entries()->fetch('foo', [])->count());
     $this->assertEquals('foo', entries()->fetch('foo')['id']);
     $this->assertEquals(3, entries()->fetch('foo', ['collection' => true])->count());
 
@@ -43,9 +43,9 @@
     $this->assertEquals('Baz', entries()->fetch('foo/baz')['title']);
     $this->assertEquals('Zed', entries()->fetch('foo/zed')['title']);
 
-    entries()->storage()->set('fetch.id', 'wrong-entry');
+    entries()->registry()->set('fetch.id', 'wrong-entry');
     $this->assertEquals(0, entries()->fetch('wrong-entry')->count());
-    entries()->storage()->set('fetch.id', 'wrong-entry');
+    entries()->registry()->set('fetch.id', 'wrong-entry');
     $this->assertEquals(0, entries()->fetch('wrong-entry')->count());
 
     $this->assertTrue(count(entries()->fetch('foo', ['collection' => true])) > 0);
@@ -108,15 +108,15 @@
 });
 
 test('test storage() entry', function () {
-    entries()->storage()->set('foo', ['title' => 'Foo']);
-    $this->assertEquals('Foo', entries()->storage()->get('foo')['title']);
-    entries()->storage()->set('bar', ['title' => 'Bar']);
-    $this->assertEquals(true, entries()->storage()->has('foo.title'));
-    $this->assertEquals(true, entries()->storage()->has('bar.title'));
-    entries()->storage()->delete('foo.title');
-    entries()->storage()->delete('bar.title');
-    $this->assertEquals(false, entries()->storage()->has('foo.title'));
-    $this->assertEquals(false, entries()->storage()->has('bar.title'));
+    entries()->registry()->set('foo', ['title' => 'Foo']);
+    $this->assertEquals('Foo', entries()->registry()->get('foo')['title']);
+    entries()->registry()->set('bar', ['title' => 'Bar']);
+    $this->assertEquals(true, entries()->registry()->has('foo.title'));
+    $this->assertEquals(true, entries()->registry()->has('bar.title'));
+    entries()->registry()->delete('foo.title');
+    entries()->registry()->delete('bar.title');
+    $this->assertEquals(false, entries()->registry()->has('foo.title'));
+    $this->assertEquals(false, entries()->registry()->has('bar.title'));
 });
 
 test('test macro() entry', function () {
diff --git a/tests/Foundation/Entries/Fields/ContentFieldTest.php b/tests/Foundation/Entries/Fields/EntriesFieldTest.php
similarity index 96%
rename from tests/Foundation/Entries/Fields/ContentFieldTest.php
rename to tests/Foundation/Entries/Fields/EntriesFieldTest.php
index 71a28bb72..92c831e23 100644
--- a/tests/Foundation/Entries/Fields/ContentFieldTest.php
+++ b/tests/Foundation/Entries/Fields/EntriesFieldTest.php
@@ -17,7 +17,7 @@
 
     $blog = entries()->fetch('blog');
 
-    $this->assertEquals(14, $blog->count());
+    $this->assertEquals(13, $blog->count());
 });
 
 test('test entries field for catalog', function () {
@@ -40,7 +40,7 @@
 
     $catalogSingle = entries()->fetch('catalog');
 
-    $this->assertEquals(16, $catalogSingle->count());
+    $this->assertEquals(15, $catalogSingle->count());
     $this->assertEquals('Catalog', $catalogSingle['title']);
     $this->assertEquals('catalog', $catalogSingle['id']);
     $this->assertEquals(1, $catalogSingle['bikes']->count());
@@ -76,7 +76,7 @@
 
     $root = entries()->fetch('root');
 
-    $this->assertEquals(16, $root->count());
+    $this->assertEquals(15, $root->count());
 });
 
 test('test entries field for long nested entries', function () {
@@ -87,7 +87,7 @@
 
     $level = entries()->fetch('level1');
 
-    $this->assertEquals(14, $level->count());
+    $this->assertEquals(13, $level->count());
     $this->assertEquals('level1/level2', $level['root']['id']);
     $this->assertEquals('level1/level2/level3', $level['root']['root']['id']);
     $this->assertEquals('level1/level2/level3/level4', $level['root']['root']['root']['id']);
diff --git a/tests/Foundation/Entries/Fields/ParsersFieldTest.php b/tests/Foundation/Entries/Fields/ParsersFieldTest.php
index 5fba4f43a..79d842dfb 100644
--- a/tests/Foundation/Entries/Fields/ParsersFieldTest.php
+++ b/tests/Foundation/Entries/Fields/ParsersFieldTest.php
@@ -11,9 +11,6 @@
 });
 
 test('test ParsersField', function () {
-    entries()->create('foo', ['entries' => '# Foo', 'parsers' => ['markdown' => ['enabled' => true, 'fields' => ['entries']]]]);
-    $this->assertEquals(trim('<h1>Foo</h1>'), trim(entries()->fetch('foo')['entries']));
-
     entries()->create('bar', ['entries' => '[registry_get name="Bar" default="Zed"]', 'parsers' => ['shortcode' => ['enabled' => true, 'fields' => ['entries']]]]);
     $this->assertEquals('Zed', entries()->fetch('bar')['entries']);
 });