diff --git a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt
index 0d21598eb8..df37efdddb 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/CMakeLists.txt
@@ -6,15 +6,12 @@
 
 set(L0_TESTS_TOOLS_SYSMAN_PERFORMANCE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}test_zes_performance.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_sysfs_performance.h
 )
 
-if(NEO_ENABLE_i915_PRELIM_DETECTION)
-  list(APPEND L0_TESTS_TOOLS_SYSMAN_PERFORMANCE_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_performance_prelim.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysfs_performance_prelim.h
-  )
-else()
-  list(APPEND L0_TESTS_TOOLS_SYSMAN_PERFORMANCE_LINUX
+if((NEO_ENABLE_i915_PRELIM_DETECTION) AND ("${BRANCH_TYPE}" STREQUAL ""))
+  list(REMOVE_ITEM L0_TESTS_TOOLS_SYSMAN_PERFORMANCE_LINUX
        ${CMAKE_CURRENT_SOURCE_DIR}/test_zes_performance.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/mock_sysfs_performance.h
   )
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h
deleted file mode 100644
index 2d075e50ee..0000000000
--- a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2021-2022 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-#include "level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h"
-
-#include "sysman/linux/fs_access.h"
-#include "sysman/performance/performance.h"
-#include "sysman/performance/performance_imp.h"
-
-namespace L0 {
-namespace ult {
-
-const std::string mediaFreqFactorSubDevice0("gt/gt0/media_freq_factor");
-const std::string mediaScaleSubDevice0("gt/gt0/media_freq_factor.scale");
-const std::string baseFreqFactorSubDevice0("gt/gt0/base_freq_factor");
-const std::string baseScaleSubDevice0("gt/gt0/base_freq_factor.scale");
-const std::string mediaFreqFactorSubDevice1("gt/gt1/media_freq_factor");
-const std::string mediaScaleSubDevice1("gt/gt1/media_freq_factor.scale");
-const std::string baseFreqFactorSubDevice1("gt/gt1/base_freq_factor");
-const std::string baseScaleSubDevice1("gt/gt1/base_freq_factor.scale");
-const std::string pwrBalance("sys_pwr_balance");
-class PerformanceSysfsAccess : public SysfsAccess {};
-
-template <>
-struct Mock<PerformanceSysfsAccess> : public PerformanceSysfsAccess {
-    ze_result_t mockReadResult = ZE_RESULT_SUCCESS;
-    ze_result_t mockCanReadResult = ZE_RESULT_SUCCESS;
-    ze_bool_t isComputeInvalid = false;
-    ze_bool_t isReturnUnknownFailure = false;
-    ze_bool_t returnNegativeFactor = false;
-    ze_bool_t isMediaBaseFailure = false;
-
-    ze_result_t getValWithMultiplierReturnOne(const std::string file, double &val) {
-        if ((file.compare(baseFreqFactorSubDevice0) == 0) || (file.compare(baseFreqFactorSubDevice1) == 0)) {
-            val = mockBaseVal1;
-        } else if ((file.compare(mediaFreqFactorSubDevice0) == 0) || (file.compare(mediaFreqFactorSubDevice1) == 0)) {
-            val = mockMediaVal1;
-        } else if ((file.compare(mediaScaleSubDevice0) == 0) || (file.compare(mediaScaleSubDevice1) == 0) || (file.compare(baseScaleSubDevice0) == 0) || (file.compare(baseScaleSubDevice1) == 0)) {
-            val = mockScale;
-        } else if (file.compare(pwrBalance) == 0) {
-            val = mockPwrBalance;
-        } else {
-            return ZE_RESULT_ERROR_NOT_AVAILABLE;
-        }
-        return ZE_RESULT_SUCCESS;
-    }
-
-    ze_result_t getValUnknownFailure(const std::string file, double &val) {
-        if ((file.compare(baseFreqFactorSubDevice0) == 0) || (file.compare(baseFreqFactorSubDevice1) == 0)) {
-            val = 64.0;
-        } else if ((file.compare(mediaFreqFactorSubDevice0) == 0) || (file.compare(mediaFreqFactorSubDevice1) == 0)) {
-            val = 384.0;
-        } else if ((file.compare(mediaScaleSubDevice0) == 0) || (file.compare(mediaScaleSubDevice1) == 0) || (file.compare(baseScaleSubDevice0) == 0) || (file.compare(baseScaleSubDevice1) == 0)) {
-            val = mockScale;
-        } else if (file.compare(pwrBalance) == 0) {
-            val = 100.0;
-        } else {
-            return ZE_RESULT_ERROR_NOT_AVAILABLE;
-        }
-        return ZE_RESULT_SUCCESS;
-    }
-
-    ze_result_t getValNegative(const std::string file, double &val) {
-        const std::list<std::string> nodeList = {baseFreqFactorSubDevice0, baseFreqFactorSubDevice1, mediaFreqFactorSubDevice0, mediaFreqFactorSubDevice1, mediaScaleSubDevice0, mediaScaleSubDevice1, baseScaleSubDevice0, baseScaleSubDevice1, pwrBalance};
-        for (const auto &node : nodeList) {
-            if ((file.compare(node) == 0)) {
-                val = -1.0;
-                return ZE_RESULT_SUCCESS;
-            }
-        }
-        return ZE_RESULT_ERROR_NOT_AVAILABLE;
-    }
-
-    ze_result_t getValMediaBaseFailure(const std::string file, double &val) {
-        if ((file.compare(baseFreqFactorSubDevice0) == 0) || (file.compare(baseFreqFactorSubDevice1) == 0) || (file.compare(mediaFreqFactorSubDevice0) == 0) || (file.compare(mediaFreqFactorSubDevice1) == 0) || (file.compare(pwrBalance) == 0)) {
-            return ZE_RESULT_ERROR_NOT_AVAILABLE;
-        }
-        if ((file.compare(mediaScaleSubDevice0) == 0) || (file.compare(mediaScaleSubDevice1) == 0) || (file.compare(baseScaleSubDevice0) == 0) || (file.compare(baseScaleSubDevice1) == 0)) {
-            val = mockScale;
-        }
-        return ZE_RESULT_SUCCESS;
-    }
-
-    ze_result_t getValComputeInvalid(const std::string file, double &val) {
-        if ((file.compare(baseFreqFactorSubDevice0) == 0) || (file.compare(baseFreqFactorSubDevice1) == 0)) {
-            val = 1024.0;
-        } else if ((file.compare(mediaScaleSubDevice0) == 0) || (file.compare(mediaScaleSubDevice1) == 0) || (file.compare(baseScaleSubDevice0) == 0) || (file.compare(baseScaleSubDevice1) == 0)) {
-            val = mockScale;
-        } else {
-            return ZE_RESULT_ERROR_NOT_AVAILABLE;
-        }
-        return ZE_RESULT_SUCCESS;
-    }
-
-    ze_result_t getValScaleFailure(const std::string file, double &val) {
-        if ((file.compare(mediaScaleSubDevice0) == 0) || (file.compare(mediaScaleSubDevice1) == 0) || (file.compare(baseScaleSubDevice0) == 0) || (file.compare(baseScaleSubDevice1) == 0)) {
-            return ZE_RESULT_ERROR_NOT_AVAILABLE;
-        }
-        return ZE_RESULT_SUCCESS;
-    }
-
-    ze_result_t canRead(const std::string file) override {
-        if (mockCanReadResult != ZE_RESULT_SUCCESS) {
-            return mockCanReadResult;
-        }
-
-        if ((file.compare(baseFreqFactorSubDevice0) == 0) || (file.compare(baseFreqFactorSubDevice1) == 0) || (file.compare(mediaFreqFactorSubDevice0) == 0) || (file.compare(mediaFreqFactorSubDevice1) == 0) || (file.compare(pwrBalance) == 0)) {
-            return ZE_RESULT_SUCCESS;
-        }
-        return ZE_RESULT_ERROR_INSUFFICIENT_PERMISSIONS;
-    }
-
-    ze_result_t write(const std::string file, const double val) override {
-        if ((file.compare(baseFreqFactorSubDevice0) == 0) || (file.compare(baseFreqFactorSubDevice1) == 0)) {
-            mockBaseVal1 = val;
-        } else if ((file.compare(mediaFreqFactorSubDevice0) == 0) || (file.compare(mediaFreqFactorSubDevice1) == 0)) {
-            mockMediaVal1 = val;
-        } else if (file.compare(pwrBalance) == 0) {
-            mockPwrBalance = val;
-        } else {
-            return ZE_RESULT_ERROR_NOT_AVAILABLE;
-        }
-        return ZE_RESULT_SUCCESS;
-    }
-
-    ze_result_t read(const std::string file, double &val) override {
-        if (mockReadResult != ZE_RESULT_SUCCESS) {
-            return mockReadResult;
-        }
-
-        if (isReturnUnknownFailure) {
-            return getValUnknownFailure(file, val);
-        } else if (isMediaBaseFailure) {
-            return getValMediaBaseFailure(file, val);
-        } else if (isComputeInvalid) {
-            return getValComputeInvalid(file, val);
-        } else if (returnNegativeFactor) {
-            return getValNegative(file, val);
-        } else {
-            return getValWithMultiplierReturnOne(file, val);
-        }
-    }
-
-    double mockBaseVal1 = 128.0;
-    double mockMediaVal1 = 256.0;
-    double mockMultiplierBase = 256.0;
-    double mockMultiplierMedia = 512.0;
-    double mockScale = 0.00390625;
-    double mockPwrBalance = 0.0;
-    Mock<PerformanceSysfsAccess>() = default;
-};
-
-class PublicLinuxPerformanceImp : public L0::LinuxPerformanceImp {
-  public:
-    PublicLinuxPerformanceImp(OsSysman *pOsSysman, ze_bool_t onSubdevice, uint32_t subdeviceId, zes_engine_type_flag_t domain) : LinuxPerformanceImp(pOsSysman, onSubdevice, subdeviceId, domain) {}
-    using LinuxPerformanceImp::domain;
-    using LinuxPerformanceImp::pSysfsAccess;
-};
-
-} // namespace ult
-} // namespace L0
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/test_zes_performance_prelim.cpp b/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/test_zes_performance_prelim.cpp
deleted file mode 100644
index d85f16e43d..0000000000
--- a/level_zero/tools/test/unit_tests/sources/sysman/performance/linux/test_zes_performance_prelim.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (C) 2021-2022 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "level_zero/tools/test/unit_tests/sources/sysman/linux/mock_sysman_fixture.h"
-#include "level_zero/tools/test/unit_tests/sources/sysman/performance/linux/mock_sysfs_performance_prelim.h"
-
-extern bool sysmanUltsEnable;
-
-using ::testing::_;
-using ::testing::DoDefault;
-using ::testing::InSequence;
-using ::testing::Matcher;
-using ::testing::Return;
-
-namespace L0 {
-namespace ult {
-
-constexpr uint32_t mockHandleCount = 5;
-constexpr double maxPerformanceFactor = 100;
-constexpr double halfOfMaxPerformanceFactor = 50;
-constexpr double minPerformanceFactor = 0;
-class ZesPerformanceFixture : public SysmanMultiDeviceFixture {
-  protected:
-    std::unique_ptr<Mock<PerformanceSysfsAccess>> ptestSysfsAccess;
-    std::vector<ze_device_handle_t> deviceHandles;
-    SysfsAccess *pOriginalSysfsAccess = nullptr;
-    void SetUp() override {
-        if (!sysmanUltsEnable) {
-            GTEST_SKIP();
-        }
-        SysmanMultiDeviceFixture::SetUp();
-        ptestSysfsAccess = std::make_unique<NiceMock<Mock<PerformanceSysfsAccess>>>();
-        pOriginalSysfsAccess = pLinuxSysmanImp->pSysfsAccess;
-        pLinuxSysmanImp->pSysfsAccess = ptestSysfsAccess.get();
-        for (auto &handle : pSysmanDeviceImp->pPerformanceHandleContext->handleList) {
-            delete handle;
-            handle = nullptr;
-            pSysmanDeviceImp->pPerformanceHandleContext->handleList.pop_back();
-        }
-        uint32_t subDeviceCount = 0;
-        Device::fromHandle(device->toHandle())->getSubDevices(&subDeviceCount, nullptr);
-        if (subDeviceCount == 0) {
-            deviceHandles.resize(1, device->toHandle());
-        } else {
-            deviceHandles.resize(subDeviceCount, nullptr);
-            Device::fromHandle(device->toHandle())->getSubDevices(&subDeviceCount, deviceHandles.data());
-        }
-        getPerfHandles(0);
-    }
-    void TearDown() override {
-        if (!sysmanUltsEnable) {
-            GTEST_SKIP();
-        }
-        SysmanMultiDeviceFixture::TearDown();
-        pLinuxSysmanImp->pSysfsAccess = pOriginalSysfsAccess;
-    }
-
-    std::vector<zes_perf_handle_t> getPerfHandles(uint32_t count) {
-        std::vector<zes_perf_handle_t> handles(count, nullptr);
-        EXPECT_EQ(zesDeviceEnumPerformanceFactorDomains(device->toHandle(), &count, handles.data()), ZE_RESULT_SUCCESS);
-        return handles;
-    }
-};
-TEST_F(SysmanMultiDeviceFixture, GivenValidSysmanHandleAndSysfsFilesAbsentWhenEnumerateCalledThenAPISucceedesWithZeroPerfHandles) {
-    uint32_t count = 0;
-    ze_result_t result = zesDeviceEnumPerformanceFactorDomains(device->toHandle(), &count, NULL);
-    EXPECT_EQ(ZE_RESULT_SUCCESS, result);
-    EXPECT_EQ(count, 0u);
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidSysmanHandleWhenRetrievingPerfThenValidHandlesReturned) {
-    uint32_t count = 0;
-    ze_result_t result = zesDeviceEnumPerformanceFactorDomains(device->toHandle(), &count, NULL);
-    EXPECT_EQ(ZE_RESULT_SUCCESS, result);
-    EXPECT_EQ(count, mockHandleCount);
-
-    uint32_t testcount = count + 1;
-    result = zesDeviceEnumPerformanceFactorDomains(device->toHandle(), &testcount, NULL);
-    EXPECT_EQ(ZE_RESULT_SUCCESS, result);
-    EXPECT_EQ(testcount, mockHandleCount);
-
-    count = 0;
-    std::vector<zes_perf_handle_t> handles(count, nullptr);
-    EXPECT_EQ(zesDeviceEnumPerformanceFactorDomains(device->toHandle(), &count, handles.data()), ZE_RESULT_SUCCESS);
-    EXPECT_EQ(count, mockHandleCount);
-}
-
-TEST_F(ZesPerformanceFixture, GivenInAnyDomainTypeIfcanReadFailsWhenGettingPerfHandlesThenZeroHandlesAreRetrieved) {
-    ptestSysfsAccess->mockCanReadResult = ZE_RESULT_ERROR_INSUFFICIENT_PERMISSIONS;
-    for (auto &handle : pSysmanDeviceImp->pPerformanceHandleContext->handleList) {
-        delete handle;
-        handle = nullptr;
-        pSysmanDeviceImp->pPerformanceHandleContext->handleList.pop_back();
-    }
-
-    PublicLinuxPerformanceImp *pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_MEDIA);
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-    delete pLinuxPerformanceImp;
-
-    pLinuxPerformanceImp = nullptr;
-    pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_OTHER);
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-    delete pLinuxPerformanceImp;
-
-    pLinuxPerformanceImp = nullptr;
-    pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 0, 0u, ZES_ENGINE_TYPE_FLAG_COMPUTE);
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-    delete pLinuxPerformanceImp;
-}
-
-TEST_F(ZesPerformanceFixture, GivenInAnyDomainTypeIfSysfsReadForMediaAndComputeScaleFailsWhileGettingPerfHandlesThenZeroHandlesAreRetrieved) {
-    ptestSysfsAccess->mockReadResult = ZE_RESULT_ERROR_INSUFFICIENT_PERMISSIONS;
-    for (auto &handle : pSysmanDeviceImp->pPerformanceHandleContext->handleList) {
-        delete handle;
-        handle = nullptr;
-        pSysmanDeviceImp->pPerformanceHandleContext->handleList.pop_back();
-    }
-
-    PublicLinuxPerformanceImp *pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_MEDIA);
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-
-    delete pLinuxPerformanceImp;
-    pLinuxPerformanceImp = nullptr;
-    pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_COMPUTE);
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-
-    delete pLinuxPerformanceImp;
-}
-
-TEST_F(ZesPerformanceFixture, GivenInAnyDomainTypeIfMediaAndBaseFreqFactorSysfsNodesAreAbsentWhenGettingPerfHandlesThenZeroHandlesAreRetrieved) {
-    for (auto &handle : pSysmanDeviceImp->pPerformanceHandleContext->handleList) {
-        delete handle;
-        handle = nullptr;
-        pSysmanDeviceImp->pPerformanceHandleContext->handleList.pop_back();
-    }
-    ptestSysfsAccess->mockReadResult = ZE_RESULT_ERROR_NOT_AVAILABLE;
-    PublicLinuxPerformanceImp *pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_MEDIA);
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-
-    delete pLinuxPerformanceImp;
-    pLinuxPerformanceImp = nullptr;
-    pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_COMPUTE);
-
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-
-    delete pLinuxPerformanceImp;
-}
-
-TEST_F(ZesPerformanceFixture, GivenIncorrectConditionsWhenGettingPerfHandlesThenZeroHandlesAreRetrieved) {
-    // Check perf handle with incorrect domain type
-    PublicLinuxPerformanceImp *pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_DMA);
-    EXPECT_FALSE(pLinuxPerformanceImp->isPerformanceSupported());
-    delete pLinuxPerformanceImp;
-    pLinuxPerformanceImp = nullptr;
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandleWhenGettingPerformancePropertiesThenValidPropertiesReturned) {
-    ze_device_properties_t deviceProperties = {ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES};
-    Device::fromHandle(deviceHandles[0])->getProperties(&deviceProperties);
-
-    auto handle = getPerfHandles(1u);
-    zes_perf_properties_t properties = {};
-    EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetProperties(handle[0], &properties));
-    EXPECT_TRUE(properties.onSubdevice);
-    EXPECT_EQ(properties.engines, ZES_ENGINE_TYPE_FLAG_MEDIA);
-    EXPECT_EQ(properties.subdeviceId, deviceProperties.subdeviceId);
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandleWhenGettingConfigThenSuccessIsReturned) {
-    auto handles = getPerfHandles(mockHandleCount);
-    for (const auto &handle : handles) {
-        double factor = 0;
-        EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &factor));
-        EXPECT_EQ(factor, 100);
-    }
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandlesWhenInvalidMultiplierValuesAreReturnedBySysfsInterfaceThenUnknownErrorIsReturned) {
-    for (auto &handle : pSysmanDeviceImp->pPerformanceHandleContext->handleList) {
-        delete handle;
-        handle = nullptr;
-        pSysmanDeviceImp->pPerformanceHandleContext->handleList.pop_back();
-    }
-    ptestSysfsAccess->isReturnUnknownFailure = true;
-    pSysmanDeviceImp->pPerformanceHandleContext->init(deviceHandles, device);
-    auto handles = getPerfHandles(mockHandleCount);
-    for (const auto &handle : handles) {
-        double factor = 0;
-        EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, zesPerformanceFactorGetConfig(handle, &factor));
-    }
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandlesWhenBaseAndMediaFreqFactorNodesAreAbsentThenUnsupportedFeatureIsReturned) {
-    for (auto &handle : pSysmanDeviceImp->pPerformanceHandleContext->handleList) {
-        delete handle;
-        handle = nullptr;
-        pSysmanDeviceImp->pPerformanceHandleContext->handleList.pop_back();
-    }
-    ptestSysfsAccess->isMediaBaseFailure = true;
-    pSysmanDeviceImp->pPerformanceHandleContext->init(deviceHandles, device);
-    auto handles = getPerfHandles(mockHandleCount);
-    for (const auto &handle : handles) {
-        double factor = 0;
-        EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, zesPerformanceFactorGetConfig(handle, &factor));
-    }
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandleWhenSettingConfigThenSuccessIsReturned) {
-    auto handles = getPerfHandles(mockHandleCount);
-    for (const auto &handle : handles) {
-        double setFactor = 0;
-        double getFactor;
-        EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-        EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-
-        setFactor = 100;
-        EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-        getFactor = 0;
-        EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-        EXPECT_DOUBLE_EQ(std::round(getFactor), setFactor);
-    }
-}
-
-HWTEST2_F(ZesPerformanceFixture, GivenValidPerfHandleWhenSettingMediaConfigAndGettingMediaConfigForProductOtherThanPVCThenValidConfigIsReturned, IsNotPVC) {
-    auto handles = getPerfHandles(mockHandleCount);
-    for (const auto &handle : handles) {
-        zes_perf_properties_t properties = {};
-        EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetProperties(handle, &properties));
-        if (properties.engines == ZES_ENGINE_TYPE_FLAG_MEDIA) {
-            double setFactor = 49;
-            double getFactor = 0;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), halfOfMaxPerformanceFactor);
-
-            setFactor = 60;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), maxPerformanceFactor);
-
-            setFactor = 100;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), maxPerformanceFactor);
-
-            setFactor = 0;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), minPerformanceFactor);
-        }
-    }
-}
-
-HWTEST2_F(ZesPerformanceFixture, GivenValidPerfHandleWhenSettingMediaConfigAndGettingMediaConfigWhenProductFamilyIsPVCThenValidConfigIsReturned, IsPVC) {
-    auto handles = getPerfHandles(mockHandleCount);
-    for (const auto &handle : handles) {
-        zes_perf_properties_t properties = {};
-        EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetProperties(handle, &properties));
-        if (properties.engines == ZES_ENGINE_TYPE_FLAG_MEDIA) {
-            double setFactor = 49;
-            double getFactor = 0;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), halfOfMaxPerformanceFactor);
-
-            setFactor = 60;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), maxPerformanceFactor);
-
-            setFactor = 100;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), maxPerformanceFactor);
-
-            setFactor = 0;
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorSetConfig(handle, setFactor));
-            EXPECT_EQ(ZE_RESULT_SUCCESS, zesPerformanceFactorGetConfig(handle, &getFactor));
-            EXPECT_DOUBLE_EQ(std::round(getFactor), halfOfMaxPerformanceFactor);
-        }
-    }
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandlesButSysfsReadsFailAtDifferentBrancesWhenSettingPerfConfigThenPerfGetConfigFails) {
-    auto handles = getPerfHandles(mockHandleCount);
-    double factor = 0;
-
-    ptestSysfsAccess->isComputeInvalid = true;
-
-    PublicLinuxPerformanceImp *pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_COMPUTE);
-    EXPECT_TRUE(pLinuxPerformanceImp->isPerformanceSupported());
-    EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, pLinuxPerformanceImp->osPerformanceGetConfig(&factor));
-    delete pLinuxPerformanceImp;
-    pLinuxPerformanceImp = nullptr;
-    pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_DMA);
-    EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, pLinuxPerformanceImp->osPerformanceGetConfig(&factor));
-    delete pLinuxPerformanceImp;
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandleWhenGettingPerfConfigForOtherDomainAndSysfsReadReturnsInvalidValueThenPerfGetConfigFails) {
-    auto handles = getPerfHandles(mockHandleCount);
-    double factor = 0;
-
-    ptestSysfsAccess->returnNegativeFactor = true;
-    PublicLinuxPerformanceImp *pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 0, 0u, ZES_ENGINE_TYPE_FLAG_OTHER);
-    EXPECT_TRUE(pLinuxPerformanceImp->isPerformanceSupported());
-    EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, pLinuxPerformanceImp->osPerformanceGetConfig(&factor));
-    delete pLinuxPerformanceImp;
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidPerfHandlesButSysfsReadsFailAtDifferentBrancesWhenSettingPerfConfigThenPerfSetConfigFails) {
-    auto handles = getPerfHandles(mockHandleCount);
-    for (const auto &handle : handles) {
-        double setFactor = 110;
-        EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, zesPerformanceFactorSetConfig(handle, setFactor));
-
-        setFactor = -10;
-        EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, zesPerformanceFactorSetConfig(handle, setFactor));
-    }
-
-    double factor = 50;
-    // Set perf Config with incorrect domain type
-    PublicLinuxPerformanceImp *pLinuxPerformanceImp = new PublicLinuxPerformanceImp(pOsSysman, 1, 0u, ZES_ENGINE_TYPE_FLAG_DMA);
-    EXPECT_EQ(ZE_RESULT_ERROR_UNSUPPORTED_FEATURE, pLinuxPerformanceImp->osPerformanceSetConfig(factor));
-    delete pLinuxPerformanceImp;
-}
-
-TEST_F(ZesPerformanceFixture, GivenValidOfjectsOfClassPerformanceImpAndPerformanceHandleContextThenDuringObjectReleaseCheckDestructorBranches) {
-    for (auto &handle : pSysmanDeviceImp->pPerformanceHandleContext->handleList) {
-        auto pPerformanceImp = static_cast<PerformanceImp *>(handle);
-        delete pPerformanceImp->pOsPerformance;
-        pPerformanceImp->pOsPerformance = nullptr;
-        delete handle;
-        handle = nullptr;
-    }
-}
-
-} // namespace ult
-} // namespace L0