MAGETWO-69535: Error during importing new list of scopes through shared file

Author: shiftedreality

app/code/Magento/Store/App/Config/Source/InitialConfigSource.php

@@ -66,8 +66,7 @@ public function get($path = '')
         $data = new DataObject($this->reader->load());
 
         if ($path !== '' && $path !== null) {
-            $path = ltrim($path, '/');
-            $path = '/' . $path;
+            $path = '/' . ltrim($path, '/');
         }
 
         return $data->getData($this->configType . $path) ?: [];

app/code/Magento/Store/Test/Unit/Model/Config/ImporterTest.php

@@ -76,9 +76,6 @@ protected function setUp()
         $this->resourceMock = $this->getMockBuilder(Website::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->processorFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturn($this->processorMock);
 
         $this->model = new Importer(
             $this->dataDifferenceCalculatorMock,
@@ -97,9 +94,30 @@ public function testImport()
             ScopeInterface::SCOPE_WEBSITES => ['websites'],
         ];
 
+        $createProcessorMock = clone $this->processorMock;
+        $deleteProcessorMock = clone $this->processorMock;
+        $updateProcessorMock = clone $this->processorMock;
+
+        $this->processorFactoryMock->expects($this->exactly(3))
+            ->method('create')
+            ->withConsecutive(
+                [Importer\Processor\ProcessorFactory::TYPE_CREATE],
+                [Importer\Processor\ProcessorFactory::TYPE_DELETE],
+                [Importer\Processor\ProcessorFactory::TYPE_UPDATE]
+            )->willReturnOnConsecutiveCalls(
+                $createProcessorMock,
+                $deleteProcessorMock,
+                $updateProcessorMock
+            );
         $this->resourceMock->expects($this->once())
             ->method('beginTransaction');
-        $this->processorMock->expects($this->exactly(3))
+        $createProcessorMock->expects($this->once())
+            ->method('run')
+            ->with($data);
+        $deleteProcessorMock->expects($this->once())
+            ->method('run')
+            ->with($data);
+        $updateProcessorMock->expects($this->once())
             ->method('run')
             ->with($data);
         $this->resourceMock->expects($this->once())
@@ -133,6 +151,9 @@ public function testImport()
      */
     public function testImportWithException()
     {
+        $this->processorFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->processorMock);
         $this->resourceMock->expects($this->once())
             ->method('beginTransaction');
         $this->processorMock->expects($this->any())