test: add tearDown() and tweak setUp()

Author: kenjis

tests/system/Config/BaseConfigTest.php

@@ -49,8 +49,17 @@ protected function setUp(): void
             require $this->fixturesFolder . '/Encryption.php';
         }
 
-        BaseConfig::$registrars = [];
-        BaseConfig::setModules(new Modules()); // reset to clean copy of Modules
+        BaseConfig::reset();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        // This test modifies BaseConfig::$modules, so should reset.
+        BaseConfig::reset();
+        // This test modifies Services locator, so should reset.
+        $this->resetServices();
     }
 
     public function testBasicValues(): void
@@ -284,9 +293,6 @@ public function testDiscoveryNotEnabledWillNotPopulateRegistrarsArray(): void
         $config = new RegistrarConfig();
 
         $this->assertSame([], $config::$registrars);
-
-        // Reset Modules Config.
-        RegistrarConfig::setModules(new Modules());
     }
 
     /**
@@ -304,8 +310,5 @@ public function testRedoingDiscoveryWillStillSetDidDiscoveryPropertyToTrue(): vo
         $config = new RegistrarConfig();
 
         $this->assertTrue($this->getPrivateProperty($config, 'didDiscovery'));
-
-        // Reset locator.
-        $this->resetServices();
     }
 }