AC-8017 system settings improvement

Author: sreenia806

app/code/Magento/EncryptionKey/Test/Unit/Model/ResourceModel/Key/ChangeTest.php

@@ -158,7 +158,10 @@ public function testChangeEncryptionKeyAutogenerate()
     {
         $this->setUpChangeEncryptionKey();
         $this->randomMock->expects($this->once())->method('getRandomBytes')->willReturn('abc');
-        $this->assertEquals(ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX . 'abc', $this->model->changeEncryptionKey());
+        $this->assertEquals(
+            ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX . 'abc',
+            $this->model->changeEncryptionKey()
+        );
     }
 
     public function testChangeEncryptionKeyThrowsException()

setup/src/Magento/Setup/Test/Unit/Module/ConfigGeneratorTest.php

@@ -39,6 +39,7 @@ protected function setUp(): void
         /** @var Random|MockObject $randomMock */
         $randomMock = $this->createMock(Random::class);
         $randomMock->expects($this->any())->method('getRandomString')->willReturn('key');
+        $randomMock->expects($this->any())->method('getRandomBytes')->willReturn('randombytes');
 
         $cryptKeyGenerator = new CryptKeyGenerator($randomMock);
 
@@ -78,7 +79,11 @@ public function testCreateCryptConfigWithoutInput()
         $returnValue = $this->configGeneratorObject->createCryptConfig([]);
         $this->assertEquals(ConfigFilePool::APP_ENV, $returnValue->getFileKey());
         // phpcs:ignore Magento2.Security.InsecureFunction
-        $this->assertEquals(['crypt' => ['key' => 'key']], $returnValue->getData());
+        $this->assertEquals([
+                'crypt' => [
+                    'key' => ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX . 'randombytes'
+                ]
+            ], $returnValue->getData());
     }
 
     public function testCreateSessionConfigWithInput()