diff --git a/tests/src/flextype/HelpersTest.php b/tests/src/flextype/HelpersTest.php
index d33a1043..d72d2009 100644
--- a/tests/src/flextype/HelpersTest.php
+++ b/tests/src/flextype/HelpersTest.php
@@ -98,108 +98,6 @@ test('slugify helper', function () {
     expect(slugify())->toBeInstanceOf(Slugify::class);
 });
 
-test('collection helper', function () {
-    $this->assertEquals([], collection([])->toArray());
-});
-
-test('collectionFromJson helper', function () {
-    $this->assertEquals(['foo'], collectionFromJson("[\"foo\"]")->toArray());
-});
-
-test('collectionFromString helper', function () {
-    $this->assertEquals(['foo', 'bar'], collectionFromString('foo,bar', ',')->toArray());
-});
-
-test('collectionWithRange helper', function () {
-    $this->assertEquals([0, 1], collectionWithRange(0, 1, 1)->toArray());
-});
-
-test('filterCollection helper', function () {
-    $this->assertEquals([], filterCollection());
-    $this->assertEquals([], filterCollection([]));
-    $this->assertEquals([], filterCollection([], []));
-    $this->assertEquals(['foo', 'bar'], filterCollection(['foo', 'bar'], []));
-
-    $data = ['home'  => ['title' => 'Home'],
-             'about' => ['title' => 'About'],
-             'blog'  => ['title' => 'Blog']];
-
-    // return: first
-    $this->assertEquals(['title' => 'Home'], filterCollection($data, ['return' => 'first']));
-
-    // return: last
-    $this->assertEquals(['title' => 'Blog'], filterCollection($data, ['return' => 'last']));
-
-    // return: next
-    $this->assertEquals(['title' => 'About'], filterCollection($data, ['return' => 'next']));
-
-    // return: random
-    $random = filterCollection($data, ['return' => 'random']);
-    $this->assertContains($random, $data);
-
-    $random = filterCollection($data, ['return' => 'random', 'random' => 0]);
-    $this->assertIsArray($random);
-    $this->assertCount(0, $random);
-
-    $random = filterCollection($data, ['return' => 'random', 'random' => 1]);
-    $this->assertIsArray($random);
-    $this->assertCount(1, $random);
-    $this->assertContains(filterCollection($data, ['return' => 'first']), $data);
-
-    $random = filterCollection($data, ['return' => 'random', 'random' => 2]);
-    $this->assertIsArray($random);
-    $this->assertCount(2, $random);
-    $this->assertContains(filterCollection($random, ['return' => 'first']), $data);
-    $this->assertContains(filterCollection($random, ['return' => 'last']), $data);
-
-    // return: shuffle
-    $this->assertTrue(
-        is_array(filterCollection($data, ['return' => 'shuffle'])) &&
-        is_array(filterCollection($data, ['return' => 'shuffle']))
-    );
-
-    // param: offset and return: all
-    $this->assertEquals(['about' => ['title' => 'About'],
-                         'blog'  => ['title' => 'Blog']], filterCollection($data, ['return' => 'all', 'offset' => 1]));
-
-    // param: limit and return: all
-    $this->assertEquals(['home'  => ['title' => 'Home']], filterCollection($data, ['return' => 'all', 'limit' => 1]));
-
-    // param: sort_by and return: all
-    $this->assertEquals(['about' => ['title' => 'About'],
-                         'blog'  => ['title' => 'Blog'],
-                         'home'  => ['title' => 'Home']],
-                            filterCollection($data, ['return' => 'all',
-                                                   'sort_by' => ['key' => 'title',
-                                                                 'direction' => 'ASC']]));
-
-    $this->assertEquals(['home'  => ['title' => 'Home'],
-                         'blog'  => ['title' => 'Blog'],
-                         'about' => ['title' => 'About']],
-                            filterCollection($data, ['return' => 'all',
-                                                   'sort_by' => ['key' => 'title',
-                                                                 'direction' => 'DESC']]));
-
-     $this->assertEquals(['Home' => [0 => ['title' => 'Home']],
-                          'About' => [0 => ['title' => 'About']],
-                          'Blog' => [0 => ['title' => 'Blog']]],
-                             filterCollection($data, ['return' => 'all',
-                                                    'group_by' => 'title']));
-
-    $this->assertEquals(['home'  => ['title' => 'Home']], 
-                         filterCollection($data, ['return' => 'all',
-                                                  'only' => ['home']]));
-
-    $this->assertEquals(['home'  => ['title' => 'Home']], 
-                         filterCollection($data, ['return' => 'all',
-                                                  'except' => ['blog', 'about']]));
-
-    // param: where and return: all
-    $this->assertEquals(['about' => ['title' => 'About']],
-                        filterCollection($data, ['return' => 'all',
-                                               'where' => [['key' => 'title', 'operator' => '=', 'value' => 'About']]]));
-});
-
 test('find helper', function () {
     entries()->create('foo', []);
     $this->assertTrue(find(PATH['project'] . '/entries')->hasResults());
diff --git a/tests/src/flextype/helpers/CollectionTest.php b/tests/src/flextype/helpers/CollectionTest.php
new file mode 100644
index 00000000..9e9b45d0
--- /dev/null
+++ b/tests/src/flextype/helpers/CollectionTest.php
@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types=1);
+
+
+test('collection helper', function () {
+    $this->assertEquals([], collection([])->toArray());
+});
+
+test('collectionFromJson helper', function () {
+    $this->assertEquals(['foo'], collectionFromJson("[\"foo\"]")->toArray());
+});
+
+test('collectionFromString helper', function () {
+    $this->assertEquals(['foo', 'bar'], collectionFromString('foo,bar', ',')->toArray());
+});
+
+test('collectionWithRange helper', function () {
+    $this->assertEquals([0, 1], collectionWithRange(0, 1, 1)->toArray());
+});
+
+test('filterCollection helper', function () {
+    $this->assertEquals([], filterCollection());
+    $this->assertEquals([], filterCollection([]));
+    $this->assertEquals([], filterCollection([], []));
+    $this->assertEquals(['foo', 'bar'], filterCollection(['foo', 'bar'], []));
+
+    $data = ['home'  => ['title' => 'Home'],
+             'about' => ['title' => 'About'],
+             'blog'  => ['title' => 'Blog']];
+
+    // return: first
+    $this->assertEquals(['title' => 'Home'], filterCollection($data, ['return' => 'first']));
+
+    // return: last
+    $this->assertEquals(['title' => 'Blog'], filterCollection($data, ['return' => 'last']));
+
+    // return: next
+    $this->assertEquals(['title' => 'About'], filterCollection($data, ['return' => 'next']));
+
+    // return: random
+    $random = filterCollection($data, ['return' => 'random']);
+    $this->assertContains($random, $data);
+
+    $random = filterCollection($data, ['return' => 'random', 'random' => 0]);
+    $this->assertIsArray($random);
+    $this->assertCount(0, $random);
+
+    $random = filterCollection($data, ['return' => 'random', 'random' => 1]);
+    $this->assertIsArray($random);
+    $this->assertCount(1, $random);
+    $this->assertContains(filterCollection($data, ['return' => 'first']), $data);
+
+    $random = filterCollection($data, ['return' => 'random', 'random' => 2]);
+    $this->assertIsArray($random);
+    $this->assertCount(2, $random);
+    $this->assertContains(filterCollection($random, ['return' => 'first']), $data);
+    $this->assertContains(filterCollection($random, ['return' => 'last']), $data);
+
+    // return: shuffle
+    $this->assertTrue(
+        is_array(filterCollection($data, ['return' => 'shuffle'])) &&
+        is_array(filterCollection($data, ['return' => 'shuffle']))
+    );
+
+    // param: offset and return: all
+    $this->assertEquals(['about' => ['title' => 'About'],
+                         'blog'  => ['title' => 'Blog']], filterCollection($data, ['return' => 'all', 'offset' => 1]));
+
+    // param: limit and return: all
+    $this->assertEquals(['home'  => ['title' => 'Home']], filterCollection($data, ['return' => 'all', 'limit' => 1]));
+
+    // param: sort_by and return: all
+    $this->assertEquals(['about' => ['title' => 'About'],
+                         'blog'  => ['title' => 'Blog'],
+                         'home'  => ['title' => 'Home']],
+                            filterCollection($data, ['return' => 'all',
+                                                   'sort_by' => ['key' => 'title',
+                                                                 'direction' => 'ASC']]));
+
+    $this->assertEquals(['home'  => ['title' => 'Home'],
+                         'blog'  => ['title' => 'Blog'],
+                         'about' => ['title' => 'About']],
+                            filterCollection($data, ['return' => 'all',
+                                                   'sort_by' => ['key' => 'title',
+                                                                 'direction' => 'DESC']]));
+
+    $this->assertEquals(['Home' => [0 => ['title' => 'Home']],
+                          'About' => [0 => ['title' => 'About']],
+                          'Blog' => [0 => ['title' => 'Blog']]],
+                             filterCollection($data, ['return' => 'all',
+                                                    'group_by' => 'title']));
+
+    $this->assertEquals(['home'  => ['title' => 'Home']], 
+                         filterCollection($data, ['return' => 'all',
+                                                  'only' => ['home']]));
+
+    $this->assertEquals(['home'  => ['title' => 'Home']], 
+                         filterCollection($data, ['return' => 'all',
+                                                  'except' => ['blog', 'about']]));
+
+    // param: where and return: all
+    $this->assertEquals(['about' => ['title' => 'About']],
+                        filterCollection($data, ['return' => 'all',
+                                               'where' => [['key' => 'title', 'operator' => '=', 'value' => 'About']]]));
+
+    $this->assertEquals(['about' => ['title' => 'About']],
+                        filterCollection($data, ['return' => 'all',
+                                                'where' => [[],['key' => 'title', 'operator' => '=', 'value' => 'About']]]));                     
+});
\ No newline at end of file