From beca27599cc542edfb3657c142ec7aed1ff399bc Mon Sep 17 00:00:00 2001
From: luke <lukeraymonddowning@gmail.com>
Date: Thu, 5 Aug 2021 16:18:47 +0100
Subject: [PATCH] Further cleanup

---
 src/Console/Paratest/Runner.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Console/Paratest/Runner.php b/src/Console/Paratest/Runner.php
index d30d24b4..73b0def8 100644
--- a/src/Console/Paratest/Runner.php
+++ b/src/Console/Paratest/Runner.php
@@ -101,9 +101,9 @@ final class Runner implements RunnerInterface
     {
         $this->beforeLoadChecks();
 
-        LoadStructure::in(TestSuite::getInstance()->rootPath);
-
         $loader->load();
+        $this->pending = $loader->getSuites();
+
         $this->loadPestSuite();
 
         $this->sortPending();
@@ -330,7 +330,6 @@ final class Runner implements RunnerInterface
     private function loadPestSuite(): void
     {
         $pestTestSuite = TestSuite::getInstance();
-        LoadStructure::in($pestTestSuite->rootPath);
 
         $files = array_values(array_map(function (TestCaseFactory $factory): string {
             return $factory->filename;
@@ -348,6 +347,6 @@ final class Runner implements RunnerInterface
             );
         }, $occurrences, array_keys($occurrences)));
 
-        $this->pending = $tests;
+        $this->pending = array_merge($this->pending, $tests);
     }
 }