diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95bce31..07fb32c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,13 @@
 
 - Сhg #37: Remove parameters in `ApplicationRunner` methods `runBootstrap()` and `checkEvents()`, instead are used 
   internal container and config instances (@vjik) 
-- New #36: Add ability to configure container configuration group (@vjik)
-- New #38: Add ability to configure config params group (@vjik)
+- Chg #39: Adapt to Yii configuration groups names convention (@vjik)
+- Chg #39: Remove methods `withBootstrap()`, `withoutBootstrap()`, `withCheckingEvents()`, `withoutCheckingEvents()` 
+  from `ApplicationRunner` (@vjik) 
+- New #38, #39: Add ability to configure all config group names (@vjik)
+- New #39: Add parameter `$checkEvents` to `ApplicationRunner` constructor (@vjik)
+- Chg #39: Remove `ConfigFactory`, instead it move code to `ApplicationRunner::createDefaultConfig()` method (@vjik)
+- Enh #39: Make methods `ApplicationRunner::getConfig()` and `ApplicationRunner::getContainer()` public (@vjik)
 
 ## 1.2.1 November 07, 2022
 
diff --git a/README.md b/README.md
index 632416d..db58c57 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,11 @@ use Yiisoft\Yii\Runner\Http\HttpApplicationRunner;
 
 require_once __DIR__ . '/autoload.php';
 
-(new HttpApplicationRunner(__DIR__, $_ENV['YII_DEBUG'], $_ENV['YII_ENV']))->run();
+(new HttpApplicationRunner(
+    rootPath: __DIR__, 
+    debug: $_ENV['YII_DEBUG'],
+    environment: $_ENV['YII_ENV']
+))->run();
 ```
 
 ## Testing
diff --git a/psalm.xml b/psalm.xml
index 3f815b4..73ed715 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
diff --git a/src/ApplicationRunner.php b/src/ApplicationRunner.php
index 37b90fd..777a307 100644
--- a/src/ApplicationRunner.php
+++ b/src/ApplicationRunner.php
@@ -12,6 +12,8 @@
 use Yiisoft\Config\Config;
 use Yiisoft\Config\ConfigInterface;
 use Yiisoft\Config\ConfigPaths;
+use Yiisoft\Config\Modifier\RecursiveMerge;
+use Yiisoft\Config\Modifier\ReverseMerge;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
 use Yiisoft\Di\Container;
 use Yiisoft\Di\ContainerConfig;
@@ -22,81 +24,54 @@
  */
 abstract class ApplicationRunner implements RunnerInterface
 {
-    protected ?ConfigInterface $config = null;
-    protected ?ContainerInterface $container = null;
-    protected ?string $bootstrapGroup = null;
-    protected ?string $eventsGroup = null;
+    private ?ConfigInterface $config = null;
+    private ?ContainerInterface $container = null;
 
     /**
      * @param string $rootPath The absolute path to the project root.
      * @param bool $debug Whether the debug mode is enabled.
-     * @param string $paramsConfigGroup The config parameters group name.
-     * @param string $containerConfigGroup The container configuration group name.
+     * @param bool $checkEvents Whether to check events' configuration.
      * @param string|null $environment The environment name.
+     * @param string $bootstrapGroup The bootstrap configuration group name.
+     * @param string $eventsGroup The events' configuration group name.
+     * @param string $diGroup The container definitions' configuration group name.
+     * @param string $diProvidersGroup The container providers' configuration group name.
+     * @param string $diDelegatesGroup The container delegates' configuration group name.
+     * @param string $diTagsGroup The container tags' configuration group name.
+     * @param string $paramsGroup The configuration parameters group name.
+     * @param array $nestedParamsGroups Configuration group names that are included into configuration parameters group.
+     * This is needed for recursive merging of parameters.
+     * @param array $nestedEventsGroups Configuration group names that are included into events' configuration group.
+     * This is needed for reverse and recursive merge of events' configurations.
+     *
+     * @psalm-param list<string> $nestedParamsGroups
+     * @psalm-param list<string> $nestedEventsGroups
      */
     public function __construct(
         protected string $rootPath,
         protected bool $debug,
-        protected string $paramsConfigGroup,
-        protected string $containerConfigGroup,
-        protected ?string $environment
+        protected bool $checkEvents,
+        protected ?string $environment,
+        protected string $bootstrapGroup,
+        protected string $eventsGroup,
+        protected string $diGroup,
+        protected string $diProvidersGroup,
+        protected string $diDelegatesGroup,
+        protected string $diTagsGroup,
+        protected string $paramsGroup,
+        protected array $nestedParamsGroups,
+        protected array $nestedEventsGroups,
     ) {
     }
 
     abstract public function run(): void;
 
-    /**
-     * Returns a new instance with the specified bootstrap configuration group name.
-     *
-     * @param string $bootstrapGroup The bootstrap configuration group name.
-     */
-    public function withBootstrap(string $bootstrapGroup): static
-    {
-        $new = clone $this;
-        $new->bootstrapGroup = $bootstrapGroup;
-        return $new;
-    }
-
-    /**
-     * Returns a new instance with bootstrapping disabled.
-     */
-    public function withoutBootstrap(): static
-    {
-        $new = clone $this;
-        $new->bootstrapGroup = null;
-        return $new;
-    }
-
-    /**
-     * Returns a new instance with the specified name of event configuration group to check.
-     *
-     * Note: The configuration of events is checked in debug mode only.
-     *
-     * @param string $eventsGroup Name of event configuration group to check.
-     */
-    public function withCheckingEvents(string $eventsGroup): static
-    {
-        $new = clone $this;
-        $new->eventsGroup = $eventsGroup;
-        return $new;
-    }
-
-    /**
-     * Returns a new instance with disabled event configuration check.
-     */
-    public function withoutCheckingEvents(): static
-    {
-        $new = clone $this;
-        $new->eventsGroup = null;
-        return $new;
-    }
-
     /**
      * Returns a new instance with the specified config instance {@see ConfigInterface}.
      *
      * @param ConfigInterface $config The config instance.
      */
-    public function withConfig(ConfigInterface $config): static
+    final public function withConfig(ConfigInterface $config): static
     {
         $new = clone $this;
         $new->config = $config;
@@ -108,7 +83,7 @@ public function withConfig(ConfigInterface $config): static
      *
      * @param ContainerInterface $container The container instance.
      */
-    public function withContainer(ContainerInterface $container): static
+    final public function withContainer(ContainerInterface $container): static
     {
         $new = clone $this;
         $new->container = $container;
@@ -118,30 +93,36 @@ public function withContainer(ContainerInterface $container): static
     /**
      * @throws ErrorException|RuntimeException
      */
-    protected function runBootstrap(): void
+    final protected function runBootstrap(): void
     {
-        if ($this->bootstrapGroup !== null) {
-            (new BootstrapRunner($this->getContainer(), $this->getConfig()->get($this->bootstrapGroup)))->run();
+        $bootstrapList = $this->getConfiguration($this->bootstrapGroup);
+        if (empty($bootstrapList)) {
+            return;
         }
+
+        (new BootstrapRunner($this->getContainer(), $bootstrapList))->run();
     }
 
     /**
      * @throws ContainerExceptionInterface|ErrorException|NotFoundExceptionInterface
      */
-    protected function checkEvents(): void
+    final protected function checkEvents(): void
     {
-        if ($this->debug && $this->eventsGroup !== null) {
+        if (
+            $this->checkEvents
+            && null !== $configuration = $this->getConfiguration($this->eventsGroup)
+        ) {
             /** @psalm-suppress MixedMethodCall */
             $this->getContainer()
                 ->get(ListenerConfigurationChecker::class)
-                ->check($this->getConfig()->get($this->eventsGroup));
+                ->check($configuration);
         }
     }
 
     /**
      * @throws ErrorException
      */
-    protected function getConfig(): ConfigInterface
+    final public function getConfig(): ConfigInterface
     {
         return $this->config ??= $this->createDefaultConfig();
     }
@@ -149,9 +130,9 @@ protected function getConfig(): ConfigInterface
     /**
      * @throws ErrorException|InvalidConfigException
      */
-    protected function getContainer(): ContainerInterface
+    final public function getContainer(): ContainerInterface
     {
-        $this->container ??= $this->createDefaultContainer($this->getConfig(), $this->containerConfigGroup);
+        $this->container ??= $this->createDefaultContainer();
 
         if ($this->container instanceof Container) {
             return $this->container->get(ContainerInterface::class);
@@ -160,39 +141,54 @@ protected function getContainer(): ContainerInterface
         return $this->container;
     }
 
+    final protected function getConfiguration(string $name): ?array
+    {
+        $config = $this->getConfig();
+        return $config->has($name) ? $config->get($name) : null;
+    }
+
     /**
      * @throws ErrorException
      */
-    protected function createDefaultConfig(): Config
+    private function createDefaultConfig(): Config
     {
-        return ConfigFactory::create(
+        $paramsGroups = [$this->paramsGroup, ...$this->nestedParamsGroups];
+        $eventsGroups = [$this->eventsGroup, ...$this->nestedEventsGroups];
+
+        return new Config(
             new ConfigPaths($this->rootPath, 'config'),
             $this->environment,
-            $this->paramsConfigGroup,
+            [
+                ReverseMerge::groups(...$eventsGroups),
+                RecursiveMerge::groups(...$paramsGroups, ...$eventsGroups),
+            ],
+            $this->paramsGroup,
         );
     }
 
     /**
      * @throws ErrorException|InvalidConfigException
      */
-    protected function createDefaultContainer(ConfigInterface $config, string $definitionEnvironment): Container
+    private function createDefaultContainer(): Container
     {
         $containerConfig = ContainerConfig::create()->withValidate($this->debug);
 
-        if ($config->has($definitionEnvironment)) {
-            $containerConfig = $containerConfig->withDefinitions($config->get($definitionEnvironment));
+        $config = $this->getConfig();
+
+        if (null !== $definitions = $this->getConfiguration($this->diGroup)) {
+            $containerConfig = $containerConfig->withDefinitions($definitions);
         }
 
-        if ($config->has("providers-$definitionEnvironment")) {
-            $containerConfig = $containerConfig->withProviders($config->get("providers-$definitionEnvironment"));
+        if (null !== $providers = $this->getConfiguration($this->diProvidersGroup)) {
+            $containerConfig = $containerConfig->withProviders($providers);
         }
 
-        if ($config->has("delegates-$definitionEnvironment")) {
-            $containerConfig = $containerConfig->withDelegates($config->get("delegates-$definitionEnvironment"));
+        if (null !== $delegates = $this->getConfiguration($this->diDelegatesGroup)) {
+            $containerConfig = $containerConfig->withDelegates($delegates);
         }
 
-        if ($config->has("tags-$definitionEnvironment")) {
-            $containerConfig = $containerConfig->withTags($config->get("tags-$definitionEnvironment"));
+        if (null !== $tags = $this->getConfiguration($this->diTagsGroup)) {
+            $containerConfig = $containerConfig->withTags($tags);
         }
 
         $containerConfig = $containerConfig->withDefinitions(
diff --git a/src/BootstrapRunner.php b/src/BootstrapRunner.php
index 1f50e41..8245a9e 100644
--- a/src/BootstrapRunner.php
+++ b/src/BootstrapRunner.php
@@ -16,8 +16,10 @@
  */
 final class BootstrapRunner implements RunnerInterface
 {
-    public function __construct(private ContainerInterface $container, private array $bootstrapList = [])
-    {
+    public function __construct(
+        private ContainerInterface $container,
+        private array $bootstrapList = [],
+    ) {
     }
 
     /**
@@ -27,10 +29,12 @@ public function run(): void
     {
         foreach ($this->bootstrapList as $callback) {
             if (!is_callable($callback)) {
-                throw new RuntimeException(sprintf(
-                    'Bootstrap callback must be callable, "%s" given.',
-                    get_debug_type($callback),
-                ));
+                throw new RuntimeException(
+                    sprintf(
+                        'Bootstrap callback must be callable, "%s" given.',
+                        get_debug_type($callback),
+                    )
+                );
             }
 
             $callback($this->container);
diff --git a/src/ConfigFactory.php b/src/ConfigFactory.php
deleted file mode 100644
index 093e449..0000000
--- a/src/ConfigFactory.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Yii\Runner;
-
-use ErrorException;
-use Yiisoft\Config\Config;
-use Yiisoft\Config\ConfigPaths;
-use Yiisoft\Config\Modifier\RecursiveMerge;
-use Yiisoft\Config\Modifier\ReverseMerge;
-
-/**
- * Creates a Config instance for a given environment.
- */
-final class ConfigFactory
-{
-    /**
-     * @throws ErrorException If the environment does not exist.
-     */
-    public static function create(ConfigPaths $paths, ?string $environment, string $paramsGroup = 'params'): Config
-    {
-        $paramsGroups = ['params'];
-        if ($paramsGroup !== 'params') {
-            $paramsGroups[] = $paramsGroup;
-        }
-
-        $eventGroups = [
-            'events',
-            'events-web',
-            'events-console',
-        ];
-
-        return new Config(
-            $paths,
-            $environment,
-            [
-                ReverseMerge::groups(...$eventGroups),
-                RecursiveMerge::groups(...$paramsGroups, ...$eventGroups),
-            ],
-            $paramsGroup,
-        );
-    }
-}
diff --git a/tests/ApplicationRunnerTest.php b/tests/ApplicationRunnerTest.php
index c15b628..968fc79 100644
--- a/tests/ApplicationRunnerTest.php
+++ b/tests/ApplicationRunnerTest.php
@@ -8,11 +8,16 @@
 use Psr\Container\ContainerInterface;
 use stdClass;
 use Yiisoft\Config\Config;
+use Yiisoft\Config\ConfigInterface;
 use Yiisoft\Config\ConfigPaths;
+use Yiisoft\Config\Modifier\RecursiveMerge;
 use Yiisoft\Di\Container;
 use Yiisoft\Di\ContainerConfig;
 use Yiisoft\Yii\Event\InvalidListenerConfigurationException;
 use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\ApplicationRunner;
+use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support\EventA;
+use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support\EventB;
+use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support\EventC;
 use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support\Repository;
 
 final class ApplicationRunnerTest extends TestCase
@@ -20,22 +25,18 @@ final class ApplicationRunnerTest extends TestCase
     public function testGetConfig(): void
     {
         $runner = new ApplicationRunner();
-        $config = $runner->getConfig();
+        $config = $runner->getRunnerConfig();
 
-        $this->assertSame(['name' => 'John', 'age' => 42], $config->get('params'));
-    }
-
-    public function testCreateDefaultConfig(): void
-    {
-        $runner = new ApplicationRunner();
-        $config = $runner->createDefaultConfig();
-
-        $this->assertSame(['name' => 'John', 'age' => 42], $config->get('params'));
-
-        $config2 = $runner->createDefaultConfig();
-
-        $this->assertNotSame($config, $config2);
-        $this->assertSame(['name' => 'John', 'age' => 42], $config2->get('params'));
+        $this->assertSame(
+            [
+                'name' => [
+                    'first' => 'John',
+                    'last' => 'Smith',
+                ],
+                'age' => 42,
+            ],
+            $config->get('params')
+        );
     }
 
     public function testGetConfigAndWithConfig(): void
@@ -43,39 +44,17 @@ public function testGetConfigAndWithConfig(): void
         $config = $this->createConfig();
         $runner = (new ApplicationRunner())->withConfig($config);
 
-        $this->assertSame($config, $runner->getConfig());
+        $this->assertSame($config, $runner->getRunnerConfig());
     }
 
     public function testGetContainer(): void
     {
         $runner = new ApplicationRunner();
-        $config = $runner->getConfig();
-        $container = $runner->getContainer();
-        $stdClass = $container->get(stdClass::class);
-
-        $this->assertSame('John', $stdClass->name);
-        $this->assertSame(42, $stdClass->age);
-    }
-
-    public function testCreateDefaultContainer(): void
-    {
-        $runner = new ApplicationRunner();
-        $config = $runner->getConfig();
-
-        $container = $runner->createDefaultContainer($config, 'web');
+        $container = $runner->getRunnerContainer();
         $stdClass = $container->get(stdClass::class);
 
-        $this->assertSame('John', $stdClass->name);
+        $this->assertSame(['first' => 'John', 'last' => 'Smith'], $stdClass->name);
         $this->assertSame(42, $stdClass->age);
-
-        $container2 = $runner->createDefaultContainer($config, 'web');
-        $stdClass2 = $container2->get(stdClass::class);
-
-        $this->assertNotSame($container, $container2);
-        $this->assertNotSame($stdClass, $stdClass2);
-
-        $this->assertSame('John', $stdClass2->name);
-        $this->assertSame(42, $stdClass2->age);
     }
 
     public function testGetContainerAndWithContainer(): void
@@ -83,7 +62,7 @@ public function testGetContainerAndWithContainer(): void
         $container = $this->createContainer();
         $runner = (new ApplicationRunner())->withContainer($container);
 
-        $this->assertSame($container, $runner->getContainer());
+        $this->assertSame($container, $runner->getRunnerContainer());
     }
 
     public function testGetContainerAndWithNotYiiContainer(): void
@@ -102,17 +81,17 @@ public function has(string $id): bool
 
         $runner = (new ApplicationRunner())->withContainer($container);
 
-        $this->assertSame($container, $runner->getContainer());
+        $this->assertSame($container, $runner->getRunnerContainer());
     }
 
     public function testTags(): void
     {
         $runner = new ApplicationRunner();
-        $config = $runner->getConfig();
+        $config = $runner->getRunnerConfig();
 
-        $this->assertTrue($config->has('tags-web'));
+        $this->assertTrue($config->has('di-tags-web'));
 
-        $container = $runner->createDefaultContainer($config, 'web');
+        $container = $runner->getRunnerContainer();
         $repositories = $container->get('tag@repositories');
 
         $this->assertEquals([new Repository()], $repositories);
@@ -120,37 +99,34 @@ public function testTags(): void
 
     public function testRunBootstrap(): void
     {
-        $runner = (new ApplicationRunner())->withBootstrap('bootstrap-web');
+        $runner = new ApplicationRunner();
 
         $this->expectOutputString('Bootstrapping');
 
-        $runner->runBootstrap();
+        $runner->doRunBootstrap();
     }
 
     public function testCheckEvents(): void
     {
-        $runner = (new ApplicationRunner())->withCheckingEvents('events-fail');
-        $config = $runner->getConfig();
-        $container = $runner->getContainer();
+        $runner = new ApplicationRunner(eventsGroup: 'events-fail');
 
         $this->expectException(InvalidListenerConfigurationException::class);
 
-        $runner->checkEvents();
+        $runner->doCheckEvents();
     }
 
-    public function testRun(): void
+    public function testNotCheckEvents(): void
     {
-        $this->expectOutputString('');
-        (new ApplicationRunner())->run();
+        $runner = new ApplicationRunner(checkEvents: false, eventsGroup: 'events-fail');
+
+        $this->expectNotToPerformAssertions();
+        $runner->doCheckEvents();
     }
 
-    public function testRunWithoutBootstrapAndCheckEvents(): void
+    public function testRun(): void
     {
-        $this->expectOutputString('');
-        (new ApplicationRunner())
-            ->withoutBootstrap()
-            ->withoutCheckingEvents()
-            ->run();
+        $this->expectOutputString('Bootstrapping');
+        (new ApplicationRunner())->run();
     }
 
     public function testRunWithSetters(): void
@@ -158,29 +134,50 @@ public function testRunWithSetters(): void
         $this->expectOutputString('Bootstrapping');
 
         (new ApplicationRunner())
-            ->withCheckingEvents('events-web')
-            ->withBootstrap('bootstrap-web')
             ->withContainer($this->createContainer())
             ->withConfig($this->createConfig())
-            ->run()
-        ;
+            ->run();
+    }
+
+    public function testGetConfigFromContainer(): void
+    {
+        $config = $this->createConfig();
+
+        $runner = (new ApplicationRunner())->withConfig($config);
+
+        $this->assertSame($config, $runner->getRunnerContainer()->get(ConfigInterface::class));
+    }
+
+    public function testEvents(): void
+    {
+        $events = (new ApplicationRunner())->getRunnerConfig()->get('events-web');
+
+        $this->assertSame(
+            [
+                EventC::class => [],
+                EventB::class => [],
+                EventA::class => [],
+            ],
+            $events
+        );
     }
 
     public function testImmutability(): void
     {
         $runner = new ApplicationRunner();
 
-        $this->assertNotSame($runner, $runner->withBootstrap('bootstrap-web'));
-        $this->assertNotSame($runner, $runner->withoutBootstrap());
-        $this->assertNotSame($runner, $runner->withCheckingEvents('events-web'));
-        $this->assertNotSame($runner, $runner->withoutCheckingEvents());
         $this->assertNotSame($runner, $runner->withConfig($this->createConfig()));
         $this->assertNotSame($runner, $runner->withContainer($this->createContainer()));
     }
 
     private function createConfig(): Config
     {
-        return new Config(new ConfigPaths(__DIR__ . '/Support/ApplicationRunner', 'config'));
+        return new Config(
+            paths: new ConfigPaths(__DIR__ . '/Support/ApplicationRunner', 'config'),
+            modifiers: [
+                RecursiveMerge::groups('params'),
+            ],
+        );
     }
 
     private function createContainer(): Container
diff --git a/tests/ConfigFactoryTest.php b/tests/ConfigFactoryTest.php
deleted file mode 100644
index 7380628..0000000
--- a/tests/ConfigFactoryTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yiisoft\Yii\Runner\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Yiisoft\Config\ConfigPaths;
-use Yiisoft\Yii\Runner\ConfigFactory;
-
-final class ConfigFactoryTest extends TestCase
-{
-    public function testCreate(): void
-    {
-        $config = ConfigFactory::create(new ConfigPaths(__DIR__ . '/Support/ConfigFactory', 'config'), null);
-
-        $this->assertSame([
-            'e1' => [
-                ['app1', 'handler1'],
-                ['before-app', 'before-handler'],
-            ],
-            'e2' => [
-                ['app2', 'handler2'],
-                ['before-app', 'before-handler'],
-            ],
-        ], $config->get('events'));
-
-        $this->assertSame([
-            'e1' => [
-                ['app3', 'handler3'],
-                ['app1', 'handler1'],
-                ['before-app', 'before-handler'],
-            ],
-            'e2' => [
-                ['app2', 'handler2'],
-                ['before-app', 'before-handler'],
-            ],
-        ], $config->get('events-console'));
-
-        $this->assertSame([
-            'e1' => [
-                ['app4', 'handler4'],
-                ['app1', 'handler1'],
-                ['before-app', 'before-handler'],
-            ],
-            'e2' => [
-                ['app2', 'handler2'],
-                ['before-app', 'before-handler'],
-            ],
-        ], $config->get('events-web'));
-    }
-}
diff --git a/tests/Support/ApplicationRunner/ApplicationRunner.php b/tests/Support/ApplicationRunner/ApplicationRunner.php
index 491b004..a57a1fc 100644
--- a/tests/Support/ApplicationRunner/ApplicationRunner.php
+++ b/tests/Support/ApplicationRunner/ApplicationRunner.php
@@ -6,14 +6,28 @@
 
 use Psr\Container\ContainerInterface;
 use Yiisoft\Config\Config;
-use Yiisoft\Config\ConfigInterface;
-use Yiisoft\Di\Container;
 
 final class ApplicationRunner extends \Yiisoft\Yii\Runner\ApplicationRunner
 {
-    public function __construct()
-    {
-        parent::__construct(__DIR__, true, 'params', 'web', null);
+    public function __construct(
+        bool $checkEvents = true,
+        string $eventsGroup = 'events-web',
+    ) {
+        parent::__construct(
+            rootPath: __DIR__,
+            debug: true,
+            checkEvents: $checkEvents,
+            environment: null,
+            bootstrapGroup: 'bootstrap-web',
+            eventsGroup: $eventsGroup,
+            diGroup: 'di-web',
+            diProvidersGroup: 'di-providers-web',
+            diDelegatesGroup: 'di-delegates-web',
+            diTagsGroup: 'di-tags-web',
+            paramsGroup: 'params',
+            nestedParamsGroups: [],
+            nestedEventsGroups: ['events', 'events-more'],
+        );
     }
 
     public function run(): void
@@ -22,33 +36,23 @@ public function run(): void
         $this->checkEvents();
     }
 
-    public function runBootstrap(): void
+    public function doCheckEvents(): void
     {
-        parent::runBootstrap();
-    }
-
-    public function checkEvents(): void
-    {
-        parent::checkEvents();
-    }
-
-    public function getConfig(): ConfigInterface
-    {
-        return parent::getConfig();
+        $this->checkEvents();
     }
 
-    public function getContainer(): ContainerInterface
+    public function doRunBootstrap(): void
     {
-        return parent::getContainer();
+        $this->runBootstrap();
     }
 
-    public function createDefaultConfig(): Config
+    public function getRunnerConfig(): Config
     {
-        return parent::createDefaultConfig();
+        return $this->getConfig();
     }
 
-    public function createDefaultContainer(ConfigInterface $config, string $definitionEnvironment): Container
+    public function getRunnerContainer(): ContainerInterface
     {
-        return parent::createDefaultContainer($config, $definitionEnvironment);
+        return $this->getContainer();
     }
 }
diff --git a/tests/Support/ApplicationRunner/Support/EventA.php b/tests/Support/ApplicationRunner/Support/EventA.php
new file mode 100644
index 0000000..6c9234c
--- /dev/null
+++ b/tests/Support/ApplicationRunner/Support/EventA.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support;
+
+final class EventA
+{
+}
diff --git a/tests/Support/ApplicationRunner/Support/EventB.php b/tests/Support/ApplicationRunner/Support/EventB.php
new file mode 100644
index 0000000..da52cde
--- /dev/null
+++ b/tests/Support/ApplicationRunner/Support/EventB.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support;
+
+final class EventB
+{
+}
diff --git a/tests/Support/ApplicationRunner/Support/EventC.php b/tests/Support/ApplicationRunner/Support/EventC.php
new file mode 100644
index 0000000..e774680
--- /dev/null
+++ b/tests/Support/ApplicationRunner/Support/EventC.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support;
+
+final class EventC
+{
+}
diff --git a/tests/Support/ApplicationRunner/config/.merge-plan.php b/tests/Support/ApplicationRunner/config/.merge-plan.php
index 5937d5d..920819b 100644
--- a/tests/Support/ApplicationRunner/config/.merge-plan.php
+++ b/tests/Support/ApplicationRunner/config/.merge-plan.php
@@ -8,15 +8,28 @@
         'params' => [
             '/' => [
                 'params.php',
+                'params-more.php',
             ],
         ],
-        'web' => [
+        'di-web' => [
             '/' => [
-                'web.php',
+                'di-web.php',
+            ],
+        ],
+        'events' => [
+            '/' => [
+                'events.php',
+            ],
+        ],
+        'events-more' => [
+            '/' => [
+                '$events',
+                'events-more.php',
             ],
         ],
         'events-web' => [
             '/' => [
+                '$events-more',
                 'events-web.php',
             ],
         ],
@@ -25,14 +38,14 @@
                 'events-fail.php',
             ],
         ],
-        'providers-web' => [
+        'di-providers-web' => [
             '/' => [
-                'providers-web.php',
+                'di-providers-web.php',
             ],
         ],
-        'delegates-web' => [
+        'di-delegates-web' => [
             '/' => [
-                'delegates-web.php',
+                'di-delegates-web.php',
             ],
         ],
         'bootstrap-web' => [
@@ -40,9 +53,9 @@
                 'bootstrap-web.php',
             ],
         ],
-        'tags-web' => [
+        'di-tags-web' => [
             '/' => [
-                'tags-web.php',
+                'di-tags-web.php',
             ],
         ],
     ],
diff --git a/tests/Support/ApplicationRunner/config/delegates-web.php b/tests/Support/ApplicationRunner/config/di-delegates-web.php
similarity index 100%
rename from tests/Support/ApplicationRunner/config/delegates-web.php
rename to tests/Support/ApplicationRunner/config/di-delegates-web.php
diff --git a/tests/Support/ApplicationRunner/config/providers-web.php b/tests/Support/ApplicationRunner/config/di-providers-web.php
similarity index 100%
rename from tests/Support/ApplicationRunner/config/providers-web.php
rename to tests/Support/ApplicationRunner/config/di-providers-web.php
diff --git a/tests/Support/ApplicationRunner/config/tags-web.php b/tests/Support/ApplicationRunner/config/di-tags-web.php
similarity index 100%
rename from tests/Support/ApplicationRunner/config/tags-web.php
rename to tests/Support/ApplicationRunner/config/di-tags-web.php
diff --git a/tests/Support/ApplicationRunner/config/web.php b/tests/Support/ApplicationRunner/config/di-web.php
similarity index 100%
rename from tests/Support/ApplicationRunner/config/web.php
rename to tests/Support/ApplicationRunner/config/di-web.php
diff --git a/tests/Support/ApplicationRunner/config/events-more.php b/tests/Support/ApplicationRunner/config/events-more.php
new file mode 100644
index 0000000..cd1cab6
--- /dev/null
+++ b/tests/Support/ApplicationRunner/config/events-more.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support\EventB;
+
+return [
+    EventB::class => [],
+];
diff --git a/tests/Support/ApplicationRunner/config/events-web.php b/tests/Support/ApplicationRunner/config/events-web.php
index 0dae23d..a6176dd 100644
--- a/tests/Support/ApplicationRunner/config/events-web.php
+++ b/tests/Support/ApplicationRunner/config/events-web.php
@@ -2,4 +2,8 @@
 
 declare(strict_types=1);
 
-return [];
+use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support\EventC;
+
+return [
+    EventC::class => [],
+];
diff --git a/tests/Support/ApplicationRunner/config/events.php b/tests/Support/ApplicationRunner/config/events.php
new file mode 100644
index 0000000..570a5e4
--- /dev/null
+++ b/tests/Support/ApplicationRunner/config/events.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Yiisoft\Yii\Runner\Tests\Support\ApplicationRunner\Support\EventA;
+
+return [
+    EventA::class => [],
+];
diff --git a/tests/Support/ConfigFactory/config/events-console.php b/tests/Support/ApplicationRunner/config/params-more.php
similarity index 54%
rename from tests/Support/ConfigFactory/config/events-console.php
rename to tests/Support/ApplicationRunner/config/params-more.php
index 1024c94..245c13e 100644
--- a/tests/Support/ConfigFactory/config/events-console.php
+++ b/tests/Support/ApplicationRunner/config/params-more.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 return [
-    'e1' => [
-        ['app3', 'handler3'],
+    'name' => [
+        'last' => 'Smith',
     ],
 ];
diff --git a/tests/Support/ApplicationRunner/config/params.php b/tests/Support/ApplicationRunner/config/params.php
index 98af86a..36cdc67 100644
--- a/tests/Support/ApplicationRunner/config/params.php
+++ b/tests/Support/ApplicationRunner/config/params.php
@@ -3,6 +3,8 @@
 declare(strict_types=1);
 
 return [
-    'name' => 'John',
+    'name' => [
+        'first' => 'John',
+    ],
     'age' => 42,
 ];
diff --git a/tests/Support/ConfigFactory/config/.merge-plan.php b/tests/Support/ConfigFactory/config/.merge-plan.php
deleted file mode 100644
index d3e2cc6..0000000
--- a/tests/Support/ConfigFactory/config/.merge-plan.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-// Do not edit. Content will be replaced.
-return [
-    '/' => [
-        'params' => [
-            '/' => [
-                'params.php',
-            ],
-        ],
-        'beforeEvents' => [
-            '/' => [
-                'before-events.php',
-            ],
-        ],
-        'events' => [
-            '/' => [
-                '$beforeEvents',
-                'events.php',
-            ],
-        ],
-        'events-console' => [
-            '/' => [
-                '$events',
-                'events-console.php',
-            ],
-        ],
-        'events-web' => [
-            '/' => [
-                '$events',
-                'events-web.php',
-            ],
-        ],
-    ],
-];
diff --git a/tests/Support/ConfigFactory/config/before-events.php b/tests/Support/ConfigFactory/config/before-events.php
deleted file mode 100644
index 1436c8c..0000000
--- a/tests/Support/ConfigFactory/config/before-events.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'e1' => [
-        ['before-app', 'before-handler'],
-    ],
-    'e2' => [
-        ['before-app', 'before-handler'],
-    ],
-];
diff --git a/tests/Support/ConfigFactory/config/events-web.php b/tests/Support/ConfigFactory/config/events-web.php
deleted file mode 100644
index 2ab1c6a..0000000
--- a/tests/Support/ConfigFactory/config/events-web.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'e1' => [
-        ['app4', 'handler4'],
-    ],
-];
diff --git a/tests/Support/ConfigFactory/config/events.php b/tests/Support/ConfigFactory/config/events.php
deleted file mode 100644
index 2263427..0000000
--- a/tests/Support/ConfigFactory/config/events.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-    'e1' => [
-        ['app1', 'handler1'],
-    ],
-    'e2' => [
-        ['app2', 'handler2'],
-    ],
-];
diff --git a/tests/Support/ConfigFactory/config/params.php b/tests/Support/ConfigFactory/config/params.php
deleted file mode 100644
index 0dae23d..0000000
--- a/tests/Support/ConfigFactory/config/params.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [];