diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp
index 307e2e698f..7673cf7c2b 100644
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_in_order_cmdlist_2.cpp
@@ -230,9 +230,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
         if (dcFlushRequired) {
             EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
-        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
         } else {
             EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -260,9 +257,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
         if (dcFlushRequired) {
             EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
-        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
         } else {
             EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -313,11 +307,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDebugFlagSetWhenCreatingCmdListThenEnabl
 
         EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
         auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
-        if (device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-        } else {
-            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-        }
+        EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
         EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
 
         zeCommandListDestroy(cmdListHandle);
@@ -344,12 +334,10 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWhenCreatingCmdListThenEn
     {
         EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
         auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
+
         if (dcFlushRequired) {
             EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
-        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
         } else {
             EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -363,11 +351,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWhenCreatingCmdListThenEn
 
         EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
         auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
-        if (device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-        } else {
-            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-        }
+        EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
         EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
 
         zeCommandListDestroy(cmdListHandle);
@@ -393,9 +377,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWithCopyOffloadFlagWhenCr
         if (dcFlushRequired) {
             EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
-        } else if (device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-            EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
         } else {
             EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
             EXPECT_NE(nullptr, cmdList->cmdQImmediateCopyOffload);
@@ -409,11 +390,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenQueueDescriptorWithCopyOffloadFlagWhenCr
 
         EXPECT_EQ(ZE_RESULT_SUCCESS, zeCommandListCreateImmediate(context, device, &cmdQueueDesc, &cmdListHandle));
         auto cmdList = static_cast<WhiteBox<L0::CommandListCoreFamilyImmediate<FamilyType::gfxCoreFamily>> *>(CommandList::fromHandle(cmdListHandle));
-        if (device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_NE(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-        } else {
-            EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
-        }
+        EXPECT_EQ(CopyOffloadModes::disabled, cmdList->copyOffloadMode);
         EXPECT_EQ(nullptr, cmdList->cmdQImmediateCopyOffload);
 
         zeCommandListDestroy(cmdListHandle);
@@ -479,12 +456,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
     auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
     auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));
 
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        ASSERT_EQ(mainQueueCsr, copyQueueCsr);
-    } else {
-        ASSERT_NE(mainQueueCsr, copyQueueCsr);
-    }
-
     auto cmdStream = immCmdList->getCmdContainer().getCommandStream();
 
     auto initialMainTaskCount = mainQueueCsr->taskCount.load();
@@ -503,9 +474,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
         auto copyItor = find<XY_COPY_BLT *>(cmdList.begin(), cmdList.end());
         EXPECT_NE(cmdList.end(), copyItor);
 
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
         EXPECT_EQ(initialCopyTaskCount + 1, copyQueueCsr->taskCount);
     }
 
@@ -523,9 +492,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
         auto copyItor = find<XY_COPY_BLT *>(cmdList.begin(), cmdList.end());
         ASSERT_NE(cmdList.end(), copyItor);
 
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
         EXPECT_EQ(initialCopyTaskCount + 2, copyQueueCsr->taskCount);
     }
 
@@ -543,9 +510,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
         auto fillItor = findBltFillCmd<FamilyType>(cmdList.begin(), cmdList.end());
         EXPECT_NE(cmdList.end(), fillItor);
 
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialMainTaskCount, mainQueueCsr->taskCount);
         EXPECT_EQ(initialCopyTaskCount + 3, copyQueueCsr->taskCount);
     }
 
@@ -593,9 +558,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
         auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin(), cmdList.end());
         EXPECT_NE(cmdList.end(), itor);
 
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
         EXPECT_EQ(initialCopyTaskCount + 4, copyQueueCsr->taskCount);
     }
 
@@ -612,9 +575,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
         auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin(), cmdList.end());
         EXPECT_NE(cmdList.end(), itor);
 
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
         EXPECT_EQ(initialCopyTaskCount + 5, copyQueueCsr->taskCount);
     }
 
@@ -631,9 +592,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledWhenProgrammingHwCmdsT
         auto itor = find<XY_BLOCK_COPY_BLT *>(cmdList.begin(), cmdList.end());
         EXPECT_NE(cmdList.end(), itor);
 
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
         EXPECT_EQ(initialCopyTaskCount + 6, copyQueueCsr->taskCount);
     }
     context->freeMem(data);
@@ -755,12 +714,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
     auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
     auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));
 
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        ASSERT_EQ(mainQueueCsr, copyQueueCsr);
-    } else {
-        ASSERT_NE(mainQueueCsr, copyQueueCsr);
-    }
-
     auto initialMainTaskCount = mainQueueCsr->taskCount.load();
     auto initialCopyTaskCount = copyQueueCsr->taskCount.load();
 
@@ -778,9 +731,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
         EXPECT_EQ(cmdList.end(), copyItor);
 
         EXPECT_EQ(initialMainTaskCount + 1, mainQueueCsr->taskCount);
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
     }
 
     {
@@ -798,9 +749,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenCopyOffloadEnabledAndD2DAllocWhenProgram
         EXPECT_EQ(cmdList.end(), copyItor);
 
         EXPECT_EQ(initialMainTaskCount + 2, mainQueueCsr->taskCount);
-        if (!device->getProductHelper().useAdditionalBlitProperties()) {
-            EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
-        }
+        EXPECT_EQ(initialCopyTaskCount, copyQueueCsr->taskCount);
     }
 
     context->freeMem(deviceMem);
@@ -811,9 +760,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenProfilingEventWhenAppendingThenUseBcsCom
     using MI_LOAD_REGISTER_IMM = typename FamilyType::MI_LOAD_REGISTER_IMM;
     using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
 
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
 
     auto eventPool = createEvents<FamilyType>(1, true);
@@ -864,16 +810,11 @@ HWTEST2_F(CopyOffloadInOrderTests, givenProfilingEventWithRelaxedOrderingWhenApp
     using MI_STORE_REGISTER_MEM = typename FamilyType::MI_STORE_REGISTER_MEM;
     debugManager.flags.DirectSubmissionRelaxedOrdering.set(1);
 
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
 
     auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
     auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));
 
-    EXPECT_NE(mainQueueCsr, copyQueueCsr);
-
     auto mainQueueDirectSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(*mainQueueCsr);
     auto offloadDirectSubmission = new MockDirectSubmissionHw<FamilyType, BlitterDispatcher<FamilyType>>(*copyQueueCsr);
 
@@ -931,10 +872,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
 
     constexpr uint32_t partitionCount = 4;
 
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
-
     debugManager.flags.InOrderDuplicatedCounterStorageEnabled.set(0);
 
     auto gmmHelper = device->getNEODevice()->getGmmHelper();
@@ -943,6 +880,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
         debugManager.flags.InOrderAtomicSignallingEnabled.set(1);
 
         auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
+        immCmdList->useAdditionalBlitProperties = false;
 
         auto cmdStream = immCmdList->getCmdContainer().getCommandStream();
 
@@ -972,6 +910,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
         debugManager.flags.InOrderAtomicSignallingEnabled.set(0);
 
         auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
+        immCmdList->useAdditionalBlitProperties = false;
 
         auto cmdStream = immCmdList->getCmdContainer().getCommandStream();
 
@@ -1001,6 +940,7 @@ HWTEST2_F(CopyOffloadInOrderTests, givenAtomicSignalingModeWhenUpdatingCounterTh
         debugManager.flags.InOrderDuplicatedCounterStorageEnabled.set(1);
 
         auto immCmdList = createMultiTileImmCmdListWithOffload<FamilyType::gfxCoreFamily>(partitionCount);
+        immCmdList->useAdditionalBlitProperties = false;
 
         auto cmdStream = immCmdList->getCmdContainer().getCommandStream();
 
@@ -1077,10 +1017,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenDeviceToHostCopyWhenProgrammingThenAddFe
 }
 
 HWTEST2_F(CopyOffloadInOrderTests, whenDispatchingSelectCorrectQueueAndCsr, IsAtLeastXeHpcCore) {
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
-
     auto regularEventsPool = createEvents<FamilyType>(1, false);
 
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
@@ -1166,9 +1102,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
         bool latestRelaxedOrderingMode = false;
     };
 
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     debugManager.flags.DirectSubmissionRelaxedOrdering.set(1);
     debugManager.flags.DirectSubmissionRelaxedOrderingCounterHeuristic.set(0);
 
@@ -1177,8 +1110,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
     auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
     auto copyQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(true));
 
-    EXPECT_NE(mainQueueCsr, copyQueueCsr);
-
     auto mainQueueDirectSubmission = new MockDirectSubmissionHw<FamilyType, RenderDispatcher<FamilyType>>(*mainQueueCsr);
     auto offloadDirectSubmission = new MockDirectSubmissionHw<FamilyType, BlitterDispatcher<FamilyType>>(*copyQueueCsr);
 
@@ -1220,9 +1151,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenRelaxedOrderingEnabledWhenDispatchingThe
 }
 
 HWTEST2_F(CopyOffloadInOrderTests, givenInOrderModeWhenCallingSyncThenHandleCompletionOnCorrectCsr, IsAtLeastXeCore) {
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
 
     if (!immCmdList->isHeaplessModeEnabled()) {
@@ -1303,9 +1231,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenInOrderModeWhenCallingSyncThenHandleComp
 }
 
 HWTEST2_F(CopyOffloadInOrderTests, givenTbxModeWhenSyncCalledAlwaysDownloadAllocationsFromBothCsrs, IsAtLeastXeCore) {
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
     immCmdList->isTbxMode = true;
 
@@ -1347,9 +1272,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenTbxModeWhenSyncCalledAlwaysDownloadAlloc
 }
 
 HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHandleCompletionOnCorrectCsr, IsAtLeastXeCore) {
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
 
     auto mainQueueCsr = static_cast<UltCommandStreamReceiver<FamilyType> *>(immCmdList->getCsr(false));
@@ -1391,9 +1313,6 @@ HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHan
 }
 
 HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHandleCompletionAndTempAllocations, IsAtLeastXeCore) {
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
 
     auto memoryManager = static_cast<MockMemoryManager *>(device->getNEODevice()->getMemoryManager());
@@ -1508,10 +1427,8 @@ HWTEST2_F(CopyOffloadInOrderTests, givenNonInOrderModeWaitWhenCallingSyncThenHan
 HWTEST2_F(CopyOffloadInOrderTests, givenInterruptEventWhenDispatchingTheProgramUserInterrupt, IsAtLeastXeHpcCore) {
     using MI_USER_INTERRUPT = typename FamilyType::MI_USER_INTERRUPT;
 
-    if (device->getProductHelper().useAdditionalBlitProperties()) {
-        GTEST_SKIP();
-    }
     auto immCmdList = createImmCmdListWithOffload<FamilyType::gfxCoreFamily>();
+    immCmdList->useAdditionalBlitProperties = false;
     auto eventPool = createEvents<FamilyType>(1, false);
     events[0]->enableInterruptMode();