diff --git a/conformance_tests/core/test_barrier/src/test_barrier.cpp b/conformance_tests/core/test_barrier/src/test_barrier.cpp
index a59f278a2..7cb37b73b 100644
--- a/conformance_tests/core/test_barrier/src/test_barrier.cpp
+++ b/conformance_tests/core/test_barrier/src/test_barrier.cpp
@@ -606,8 +606,7 @@ LZT_TEST_P(
 
   const int addval_2 = 50;
   ze_module_handle_t module =
-      lzt::create_module(context, device, "barrier_add.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(context, device, "barrier_add.spv");
   ze_kernel_handle_t function_1 =
       lzt::create_function(module, "barrier_add_constant");
   lzt::set_group_size(function_1, 1, 1, 1);
diff --git a/conformance_tests/core/test_cmdlist/src/test_cmdlist.cpp b/conformance_tests/core/test_cmdlist/src/test_cmdlist.cpp
index 3a48586cf..2c9c29cdb 100644
--- a/conformance_tests/core/test_cmdlist/src/test_cmdlist.cpp
+++ b/conformance_tests/core/test_cmdlist/src/test_cmdlist.cpp
@@ -953,8 +953,7 @@ static void RunAppendLaunchKernelEvent(cmdListVec cmdlist, cmdQueueVec cmdqueue,
   const uint64_t timeout = UINT64_MAX - 1;
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
diff --git a/conformance_tests/core/test_cmdlist/src/test_cmdlist_immediate.cpp b/conformance_tests/core/test_cmdlist/src/test_cmdlist_immediate.cpp
index c1fb56016..5f811dac3 100644
--- a/conformance_tests/core/test_cmdlist/src/test_cmdlist_immediate.cpp
+++ b/conformance_tests/core/test_cmdlist/src/test_cmdlist_immediate.cpp
@@ -220,8 +220,7 @@ void zeImmediateCommandListExecutionTests::
   EXPECT_EQ(ZE_RESULT_NOT_READY, zeEventQueryStatus(event0));
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -288,8 +287,7 @@ static void RunAppendLaunchKernel(ze_command_list_handle_t cmdlist_immediate,
   memset(buffer, 0x0, size * sizeof(int));
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -364,8 +362,7 @@ RunAppendLaunchKernelEvent(std::vector<ze_command_list_handle_t> cmdlist,
       num_cmdlist * size * sizeof(int), is_shared_system);
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -1249,8 +1246,7 @@ LZT_TEST_P(
   EXPECT_EQ(ZE_RESULT_NOT_READY, zeEventQueryStatus(event0));
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -1350,8 +1346,7 @@ RunIclAndRclAppendOperations(ze_command_list_handle_t cmdlist_immediate,
   memset(buffer, 0x0, size * sizeof(int));
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -1496,8 +1491,7 @@ class zeImmediateCommandListHostSynchronizeTimeoutTests
         0);
 
     ze_module_handle_t module =
-        lzt::create_module(context, device, "cmdlist_add.spv",
-                           ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+        lzt::create_module(context, device, "cmdlist_add.spv");
     ze_kernel_handle_t kernel =
         lzt::create_function(module, "cmdlist_add_constant");
 
@@ -1606,8 +1600,7 @@ class zeImmediateCommandListInOrderCopyOffloadExecutionTests
 protected:
   void SetUp() override {
     module = lzt::create_module(lzt::zeDevice::get_instance()->get_device(),
-                                "cmdlist_add.spv", ZE_MODULE_FORMAT_IL_SPIRV,
-                                nullptr, nullptr);
+                                "cmdlist_add.spv");
     kernel = lzt::create_function(module, "cmdlist_add_constant");
 
     if (event_type == EventType::Regular) {
diff --git a/conformance_tests/core/test_cmdlist/src/test_cmdlist_mixed.cpp b/conformance_tests/core/test_cmdlist/src/test_cmdlist_mixed.cpp
index fca1cb35a..8f6e028fc 100644
--- a/conformance_tests/core/test_cmdlist/src/test_cmdlist_mixed.cpp
+++ b/conformance_tests/core/test_cmdlist/src/test_cmdlist_mixed.cpp
@@ -1836,8 +1836,7 @@ RunAppendLaunchKernelEvent(std::vector<ze_command_list_handle_t> cmdlist,
       num_cmdlist * size * sizeof(int), is_shared_system);
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -2017,8 +2016,7 @@ static void RunOutOfOrderAppendLaunchKernelEvent(
       num_cmdlist * size * sizeof(int), is_shared_system);
 
   ze_module_handle_t module = lzt::create_module(
-      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::zeDevice::get_instance()->get_device(), "cmdlist_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "cmdlist_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
diff --git a/conformance_tests/core/test_cmdqueue/src/test_cmdqueue.cpp b/conformance_tests/core/test_cmdqueue/src/test_cmdqueue.cpp
index 42a5befd1..8e9faee84 100644
--- a/conformance_tests/core/test_cmdqueue/src/test_cmdqueue.cpp
+++ b/conformance_tests/core/test_cmdqueue/src/test_cmdqueue.cpp
@@ -1130,8 +1130,7 @@ class zeCommandQueueSynchronizeTimeoutTests
         0);
 
     ze_module_handle_t module =
-        lzt::create_module(context, device, "cmdqueue_add.spv",
-                           ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+        lzt::create_module(context, device, "cmdqueue_add.spv");
     ze_kernel_handle_t kernel =
         lzt::create_function(module, "cmdqueue_add_constant");
 
diff --git a/conformance_tests/core/test_copy/src/test_multicontext_copy.cpp b/conformance_tests/core/test_copy/src/test_multicontext_copy.cpp
index ddf9bad58..17a74282a 100644
--- a/conformance_tests/core/test_copy/src/test_multicontext_copy.cpp
+++ b/conformance_tests/core/test_copy/src/test_multicontext_copy.cpp
@@ -125,8 +125,7 @@ LZT_TEST(
   LOG_INFO << "Starting verification of cross device cross context kernel "
               "buffer access";
 
-  auto module0 = lzt::create_module(context0, device0, "copy_module.spv",
-                                    ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr);
+  auto module0 = lzt::create_module(context0, device0, "copy_module.spv");
   auto kernel0 = lzt::create_function(module0, "copy_data");
   int offset = 0;
 
@@ -158,8 +157,7 @@ LZT_TEST(
     ASSERT_EQ(verification_buffer[i], pattern);
   }
 
-  auto module1 = lzt::create_module(context1, device1, "copy_module.spv",
-                                    ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr);
+  auto module1 = lzt::create_module(context1, device1, "copy_module.spv");
   auto kernel1 = lzt::create_function(module1, "copy_data");
 
   lzt::set_argument_value(kernel1, 0, sizeof(buffer_0_0), &buffer_0_0);
diff --git a/conformance_tests/core/test_device/src/test_device.cpp b/conformance_tests/core/test_device/src/test_device.cpp
index 0e6467eac..9bd280975 100644
--- a/conformance_tests/core/test_device/src/test_device.cpp
+++ b/conformance_tests/core/test_device/src/test_device.cpp
@@ -887,8 +887,7 @@ void RunGivenExecutedKernelWhenGettingGlobalTimestampsTest(bool is_immediate) {
       context, device, 0, ZE_COMMAND_QUEUE_MODE_DEFAULT,
       ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0, 0, 0, is_immediate);
 
-  auto module = lzt::create_module(context, device, "module_add.spv",
-                                   ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr);
+  auto module = lzt::create_module(context, device, "module_add.spv");
   auto kernel = lzt::create_function(module, "module_add_constant_2");
 
   auto timestamps = lzt::get_global_timestamps(device);
diff --git a/conformance_tests/core/test_event/src/test_event.cpp b/conformance_tests/core/test_event/src/test_event.cpp
index 213645a56..5c0da98c2 100644
--- a/conformance_tests/core/test_event/src/test_event.cpp
+++ b/conformance_tests/core/test_event/src/test_event.cpp
@@ -795,8 +795,7 @@ class zeEventHostSynchronizeTimeoutTests
         0);
 
     ze_module_handle_t module =
-        lzt::create_module(context, device, "profile_add.spv",
-                           ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+        lzt::create_module(context, device, "profile_add.spv");
     ze_kernel_handle_t kernel =
         lzt::create_function(module, "profile_add_constant");
 
@@ -939,8 +938,7 @@ LZT_TEST_P(
       device, context));
   std::fill_n(buf_hst, sz, 0);
 
-  auto module = lzt::create_module(context, device, "profile_add.spv",
-                                   ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+  auto module = lzt::create_module(context, device, "profile_add.spv");
   auto kernel = lzt::create_function(module, "profile_add_constant");
   uint32_t groupSizeX = 0u;
   uint32_t groupSizeY = 0u;
@@ -1086,9 +1084,7 @@ multi_device_event_signal_read(std::vector<ze_device_handle_t> devices,
     auto dst_buffer = lzt::allocate_host_memory(buff_size, 1, context);
     const int addval = 0x11223344;
     memset(src_buffer, 0, buff_size);
-    auto module =
-        lzt::create_module(context, devices[0], "profile_add.spv",
-                           ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+    auto module = lzt::create_module(context, devices[0], "profile_add.spv");
     auto kernel = lzt::create_function(module, "profile_add_constant");
     lzt::set_group_size(kernel, 1, 1, 1);
     ze_group_count_t args = {static_cast<uint32_t>(size), 1, 1};
diff --git a/conformance_tests/core/test_event/src/test_event_profiling.cpp b/conformance_tests/core/test_event/src/test_event_profiling.cpp
index 30ff7bee8..314f515fa 100644
--- a/conformance_tests/core/test_event/src/test_event_profiling.cpp
+++ b/conformance_tests/core/test_event/src/test_event_profiling.cpp
@@ -64,8 +64,7 @@ class EventProfilingTests
     cmd_bundle = lzt::create_command_bundle(
         context, device, 0, ZE_COMMAND_QUEUE_MODE_DEFAULT,
         ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0, 0, 0, is_immediate);
-    module = lzt::create_module(context, device, "profile_add.spv",
-                                ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+    module = lzt::create_module(context, device, "profile_add.spv");
     kernel = lzt::create_function(module, "profile_add_constant");
     lzt::set_group_size(kernel, 1, 1, 1);
     ze_group_count_t args = {elems_nb, 1, 1};
@@ -356,8 +355,7 @@ void RunGivenKernelEventWhenUsingEventToSyncTest(bool is_immediate) {
       context, device, 0, ZE_COMMAND_QUEUE_MODE_DEFAULT,
       ZE_COMMAND_QUEUE_PRIORITY_NORMAL, 0, 0, 0, is_immediate);
   ze_module_handle_t module =
-      lzt::create_module(context, device, "profile_add.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(context, device, "profile_add.spv");
   ze_kernel_handle_t kernel =
       lzt::create_function(module, "profile_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -432,9 +430,7 @@ static void kernel_timestamp_event_test(ze_context_handle_t context,
   event_desc.signal = ZE_EVENT_SCOPE_FLAG_DEVICE;
   auto event = lzt::create_event(event_pool, event_desc);
 
-  auto module0 =
-      lzt::create_module(context, device0, "profile_add.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+  auto module0 = lzt::create_module(context, device0, "profile_add.spv");
   auto kernel0 = lzt::create_function(module0, "profile_add_constant");
   lzt::set_group_size(kernel0, 1, 1, 1);
 
@@ -483,9 +479,7 @@ static void kernel_timestamp_event_test(ze_context_handle_t context,
   EXPECT_ZE_RESULT_SUCCESS(
       zeCommandListAppendEventReset(cmd_bundle1.list, event));
 
-  auto module1 =
-      lzt::create_module(context, device1, "profile_add.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+  auto module1 = lzt::create_module(context, device1, "profile_add.spv");
   auto kernel1 = lzt::create_function(module1, "profile_add_constant");
   lzt::set_group_size(kernel1, 1, 1, 1);
 
@@ -665,8 +659,7 @@ void RunGivenDeviceWithSubDevicesWhenQueryingForMultipleTimestampsTest(
   event_desc.signal = ZE_EVENT_SCOPE_FLAG_DEVICE;
   auto event = lzt::create_event(event_pool, event_desc);
 
-  auto module = lzt::create_module(context, device, "profile_add.spv",
-                                   ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+  auto module = lzt::create_module(context, device, "profile_add.spv");
 
   auto kernel = lzt::create_function(module, "profile_add_constant");
   lzt::set_group_size(kernel, 1, 1, 1);
@@ -828,8 +821,7 @@ LZT_TEST_P(
     }
 
     // Prepare Kernel
-    module = lzt::create_module(context, test_device, "profile_add.spv",
-                                ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+    module = lzt::create_module(context, test_device, "profile_add.spv");
     kernel = lzt::create_function(module, "profile_add_constant");
     lzt::set_group_size(kernel, 1, 1, 1);
     lzt::set_argument_value(kernel, 0, sizeof(src_buffer), &src_buffer);
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_event.cpp b/conformance_tests/core/test_ipc/src/test_ipc_event.cpp
index 2438e5968..9889a60b3 100644
--- a/conformance_tests/core/test_ipc/src/test_ipc_event.cpp
+++ b/conformance_tests/core/test_ipc/src/test_ipc_event.cpp
@@ -125,8 +125,7 @@ ze_kernel_handle_t get_matrix_multiplication_kernel(
   tg->groupCountZ = 1;
 
   ze_module_handle_t module =
-      lzt::create_module(context, device, "ze_matrix_multiplication_ipc.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(context, device, "ze_matrix_multiplication_ipc.spv");
   ze_kernel_handle_t function =
       lzt::create_function(module, "matrix_multiplication");
   lzt::set_group_size(function, 16, 16, 1);
diff --git a/conformance_tests/core/test_module/src/test_cooperative_kernel.cpp b/conformance_tests/core/test_module/src/test_cooperative_kernel.cpp
index e5f969aca..63891b489 100644
--- a/conformance_tests/core/test_module/src/test_cooperative_kernel.cpp
+++ b/conformance_tests/core/test_module/src/test_cooperative_kernel.cpp
@@ -62,8 +62,7 @@ void CooperativeKernelTests::
 
   uint32_t groups_x = 1;
 
-  module = lzt::create_module(context, device, "cooperative_kernel.spv",
-                              ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr);
+  module = lzt::create_module(device, "cooperative_kernel.spv");
   kernel = lzt::create_function(module, "cooperative_kernel");
 
   // Use a small group size in order to use more groups
diff --git a/conformance_tests/core/test_module/src/test_kernel_get_properties.cpp b/conformance_tests/core/test_module/src/test_kernel_get_properties.cpp
index ad416ba3f..282d69034 100644
--- a/conformance_tests/core/test_module/src/test_kernel_get_properties.cpp
+++ b/conformance_tests/core/test_module/src/test_kernel_get_properties.cpp
@@ -17,8 +17,7 @@ LZT_TEST(zeKernelGetNameTests, GivenKernelGetNameCorrectNameIsReturned) {
   auto context = lzt::create_context(driver);
   auto device = lzt::get_default_device(driver);
 
-  auto module = lzt::create_module(context, device, "module_add.spv",
-                                   ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr);
+  auto module = lzt::create_module(context, device, "module_add.spv");
   std::string kernelName = "module_add_constant";
   auto kernel = lzt::create_function(module, kernelName);
 
@@ -37,7 +36,7 @@ LZT_TEST(zeKernelMaxGroupSize, GivenKernelGetMaxGroupSize) {
 
   auto module = lzt::create_module(context, device, "module_add.spv",
                                    ZE_MODULE_FORMAT_IL_SPIRV,
-                                   "-ze-opt-large-register-file", nullptr);
+                                   "-ze-opt-large-register-file");
   std::string kernelName = "module_add_constant";
   auto kernel = lzt::create_function(module, kernelName);
 
diff --git a/conformance_tests/core/test_module/src/test_kernel_indirect_access.cpp b/conformance_tests/core/test_module/src/test_kernel_indirect_access.cpp
index 768221980..0858b80de 100644
--- a/conformance_tests/core/test_module/src/test_kernel_indirect_access.cpp
+++ b/conformance_tests/core/test_module/src/test_kernel_indirect_access.cpp
@@ -34,8 +34,7 @@ LZT_TEST(zeKernelIndirectAccessTests,
 
   for (auto inputFlags : indirectAccessFlags) {
 
-    auto module = lzt::create_module(context, device, "module_add.spv",
-                                     ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr);
+    auto module = lzt::create_module(context, device, "module_add.spv");
     auto kernel = lzt::create_function(module, "module_add_constant");
 
     lzt::kernel_set_indirect_access(kernel, inputFlags);
diff --git a/conformance_tests/core/test_module/src/test_kernel_schedule_hints.cpp b/conformance_tests/core/test_module/src/test_kernel_schedule_hints.cpp
index 0a65a10b3..820458563 100644
--- a/conformance_tests/core/test_module/src/test_kernel_schedule_hints.cpp
+++ b/conformance_tests/core/test_module/src/test_kernel_schedule_hints.cpp
@@ -43,8 +43,7 @@ void RunGivenKernelScheduleHintWhenRunningKernelTest(bool is_immediate) {
   auto context = lzt::create_context(driver);
   auto device = lzt::get_default_device(driver);
 
-  auto module = lzt::create_module(context, device, "module_add.spv",
-                                   ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr);
+  auto module = lzt::create_module(context, device, "module_add.spv");
   auto kernel = lzt::create_function(module, "module_add_constant_2");
 
   uint32_t hints[] = {ZE_SCHEDULING_HINT_EXP_FLAG_OLDEST_FIRST,
diff --git a/conformance_tests/core/test_usm/src/test_usm.cpp b/conformance_tests/core/test_usm/src/test_usm.cpp
index 2be2099f7..17b78648c 100644
--- a/conformance_tests/core/test_usm/src/test_usm.cpp
+++ b/conformance_tests/core/test_usm/src/test_usm.cpp
@@ -232,8 +232,7 @@ class zeDriverMemoryMigrationPageFaultTestsMultiDevice
 
       LOG_DEBUG << "call create module for device " << i;
       ze_module_handle_t module_handle = lzt::create_module(
-          context, device_handle, "test_fill_device_memory_usm.spv",
-          ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+          context, device_handle, "test_fill_device_memory_usm.spv");
 
       LOG_DEBUG << "host access pattern buffer created on device " << i;
       // Access to pattern buffer from host.
@@ -287,8 +286,7 @@ class zeDriverMemoryMigrationPageFaultTestsMultiDevice
 
         LOG_DEBUG << "call create module for device :" << index;
         ze_module_handle_t module_handle_1 = lzt::create_module(
-            context, device_handle_1, "test_fill_device_memory_usm.spv",
-            ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+            context, device_handle_1, "test_fill_device_memory_usm.spv");
 
         uint64_t *gpu_expected_output_buffer_1;
         gpu_expected_output_buffer_1 =
@@ -484,8 +482,7 @@ class zeDriverMemoryMigrationPageFaultTestsMultiDevice
 
       LOG_DEBUG << "call create module for device " << i;
       ze_module_handle_t module_handle = lzt::create_module(
-          context, device_handle, "test_fill_device_memory_usm.spv",
-          ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+          context, device_handle, "test_fill_device_memory_usm.spv");
 
       LOG_DEBUG << "host access pattern buffer created on device " << i;
       // Access to pattern buffer from host.
diff --git a/conformance_tests/sysman/test_sysman_device/src/test_sysman_device.cpp b/conformance_tests/sysman/test_sysman_device/src/test_sysman_device.cpp
index 217e8d3b4..5d588888a 100644
--- a/conformance_tests/sysman/test_sysman_device/src/test_sysman_device.cpp
+++ b/conformance_tests/sysman/test_sysman_device/src/test_sysman_device.cpp
@@ -461,8 +461,7 @@ submit_workload_for_gpu(std::vector<float> a, std::vector<float> b,
   void *b_buffer = lzt::allocate_host_memory(k * n * sizeof(float));
   void *c_buffer = lzt::allocate_host_memory(m * n * sizeof(float));
   ze_module_handle_t module =
-      lzt::create_module(device, "sysman_matrix_multiplication.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(device, "sysman_matrix_multiplication.spv");
   ze_kernel_handle_t function =
       lzt::create_function(module, "sysman_matrix_multiplication");
   lzt::set_group_size(function, 16, 16, 1);
@@ -572,9 +571,8 @@ bool compute_workload_and_validate(device_handles_t device) {
   lzt::make_memory_resident(device.core_handle, b_buffer, b_buffer_size);
   lzt::make_memory_resident(device.core_handle, c_buffer, c_buffer_size);
 
-  ze_module_handle_t module =
-      lzt::create_module(device.core_handle, "sysman_matrix_multiplication.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+  ze_module_handle_t module = lzt::create_module(
+      device.core_handle, "sysman_matrix_multiplication.spv");
   ze_kernel_handle_t function =
       lzt::create_function(module, "sysman_matrix_multiplication");
   lzt::set_group_size(function, 16, 16, 1);
diff --git a/conformance_tests/sysman/test_sysman_engine/src/test_sysman_engine.cpp b/conformance_tests/sysman/test_sysman_engine/src/test_sysman_engine.cpp
index a5984b688..f8a48fc1b 100644
--- a/conformance_tests/sysman/test_sysman_engine/src/test_sysman_engine.cpp
+++ b/conformance_tests/sysman/test_sysman_engine/src/test_sysman_engine.cpp
@@ -261,8 +261,7 @@ static void workload_for_device(ze_device_handle_t device) {
   void *b_buffer = lzt::allocate_host_memory(k * n * sizeof(float));
   void *c_buffer = lzt::allocate_host_memory(m * n * sizeof(float));
   ze_module_handle_t module =
-      lzt::create_module(device, "sysman_matrix_multiplication.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(device, "sysman_matrix_multiplication.spv");
   ze_kernel_handle_t function =
       lzt::create_function(module, "sysman_matrix_multiplication");
   lzt::set_group_size(function, 16, 16, 1);
diff --git a/conformance_tests/sysman/test_sysman_frequency/src/test_sysman_frequency.cpp b/conformance_tests/sysman/test_sysman_frequency/src/test_sysman_frequency.cpp
index 0c177024b..d670e5f18 100644
--- a/conformance_tests/sysman/test_sysman_frequency/src/test_sysman_frequency.cpp
+++ b/conformance_tests/sysman/test_sysman_frequency/src/test_sysman_frequency.cpp
@@ -567,8 +567,7 @@ void load_for_gpu(ze_device_handle_t target_device) {
   void *b_buffer = lzt::allocate_host_memory(k * n * sizeof(float));
   void *c_buffer = lzt::allocate_host_memory(m * n * sizeof(float));
   ze_module_handle_t module =
-      lzt::create_module(device, "sysman_matrix_multiplication.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(device, "sysman_matrix_multiplication.spv");
   ze_kernel_handle_t function =
       lzt::create_function(module, "sysman_matrix_multiplication");
   lzt::set_group_size(function, 16, 16, 1);
@@ -724,8 +723,7 @@ void loadForGpuMaxFreqTest(ze_device_handle_t target_device) {
   void *b_buffer = lzt::allocate_host_memory(k * n * sizeof(float));
   void *c_buffer = lzt::allocate_host_memory(m * n * sizeof(float));
   ze_module_handle_t module =
-      lzt::create_module(device, "sysman_matrix_multiplication.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(device, "sysman_matrix_multiplication.spv");
   ze_kernel_handle_t function =
       lzt::create_function(module, "sysman_matrix_multiplication");
   lzt::set_group_size(function, 16, 16, 1);
diff --git a/conformance_tests/sysman/test_sysman_memory/src/test_sysman_memory.cpp b/conformance_tests/sysman/test_sysman_memory/src/test_sysman_memory.cpp
index 48e84e924..a6d74ae14 100644
--- a/conformance_tests/sysman/test_sysman_memory/src/test_sysman_memory.cpp
+++ b/conformance_tests/sysman/test_sysman_memory/src/test_sysman_memory.cpp
@@ -282,8 +282,7 @@ ze_result_t copy_workload(ze_device_handle_t device,
   void *dst_buffer = dst_ptr;
   uint32_t offset = 0;
 
-  ze_module_handle_t module = lzt::create_module(
-      device, "copy_module.spv", ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+  ze_module_handle_t module = lzt::create_module(device, "copy_module.spv");
   ze_kernel_handle_t function = lzt::create_function(module, "copy_data");
 
   lzt::set_group_size(function, 1, 1, 1);
diff --git a/conformance_tests/tools/debug/src/test_debug.cpp b/conformance_tests/tools/debug/src/test_debug.cpp
index 3355068a0..d5ab1a01c 100644
--- a/conformance_tests/tools/debug/src/test_debug.cpp
+++ b/conformance_tests/tools/debug/src/test_debug.cpp
@@ -2228,9 +2228,7 @@ LZT_TEST(zetModuleGetDebugInfoTest,
   auto context = lzt::create_context(driver);
 
   for (auto &device : devices) {
-    auto module =
-        lzt::create_module(context, device, "debug_add.spv",
-                           ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+    auto module = lzt::create_module(context, device, "debug_add.spv");
     auto debug_info = lzt::get_debug_info(module);
     ASSERT_NE(debug_info.size(), 0);
     ASSERT_EQ(debug_info[1], 'E');
diff --git a/conformance_tests/tools/debug/src/test_debug_helper.cpp b/conformance_tests/tools/debug/src/test_debug_helper.cpp
index 2289614af..363953f14 100644
--- a/conformance_tests/tools/debug/src/test_debug_helper.cpp
+++ b/conformance_tests/tools/debug/src/test_debug_helper.cpp
@@ -40,7 +40,7 @@ void basic(ze_context_handle_t context, ze_device_handle_t device,
   std::string module_name =
       options.use_custom_module ? options.module_name_in : "debug_add.spv";
   auto module = lzt::create_module(context, device, module_name,
-                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g", nullptr);
+                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g");
 
   auto kernel = lzt::create_function(module, "debug_add_constant_2");
 
@@ -130,7 +130,7 @@ void attach_after_module_created_test(ze_context_handle_t context,
 
   LOG_INFO << "[Application] Creating module";
   auto module = lzt::create_module(context, device, module_name,
-                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g", nullptr);
+                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g");
 
   LOG_INFO << "[Application] Creating kernel";
   auto kernel = lzt::create_function(module, "debug_add_constant_2");
@@ -225,7 +225,7 @@ void attach_after_module_destroyed_test(ze_context_handle_t context,
   std::string module_name =
       options.use_custom_module ? options.module_name_in : "debug_add.spv";
   auto module = lzt::create_module(context, device, module_name,
-                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g", nullptr);
+                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g");
 
   auto kernel = lzt::create_function(module, "debug_add_constant_2");
 
@@ -323,11 +323,11 @@ void multiple_modules_created_test(ze_context_handle_t context,
   std::string module_name =
       options.use_custom_module ? options.module_name_in : "debug_add.spv";
   auto module = lzt::create_module(context, device, module_name,
-                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g", nullptr);
+                                   ZE_MODULE_FORMAT_IL_SPIRV, "-g");
   auto kernel = lzt::create_function(module, "debug_add_constant_2");
 
   auto module2 = lzt::create_module(context, device, "1kernel.spv",
-                                    ZE_MODULE_FORMAT_IL_SPIRV, "-g", nullptr);
+                                    ZE_MODULE_FORMAT_IL_SPIRV, "-g");
   auto kernel2 = lzt::create_function(module2, "kernel1");
 
   ze_group_count_t group_count = {};
@@ -436,9 +436,8 @@ void run_long_kernel(ze_context_handle_t context, ze_device_handle_t device,
     mod_options.append(" " + options.module_options_in);
   }
   LOG_INFO << "Module Options: " << mod_options;
-  auto module =
-      lzt::create_module(device, module_name, ZE_MODULE_FORMAT_IL_SPIRV,
-                         mod_options.c_str(), nullptr);
+  auto module = lzt::create_module(
+      device, module_name, ZE_MODULE_FORMAT_IL_SPIRV, mod_options.c_str());
 
   auto kernel = lzt::create_function(module, kernel_name);
 
@@ -746,8 +745,8 @@ void Job::set_up_work(debug_options &options) {
 
   LOG_INFO << "[Application] Creating Module";
 
-  module = lzt::create_module(device, module_name, ZE_MODULE_FORMAT_IL_SPIRV,
-                              "-g", nullptr);
+  module =
+      lzt::create_module(device, module_name, ZE_MODULE_FORMAT_IL_SPIRV, "-g");
 
   LOG_INFO << "[Application] Creating Kernels";
 
@@ -975,9 +974,9 @@ void multidevice_resource_stress_test(ze_context_handle_t &context,
   lzt::event_host_synchronize(event, UINT64_MAX);
   lzt::reset_command_list(command_list);
 
-  auto module = lzt::create_module(device_0, "debug_transform.spv",
-                                   ZE_MODULE_FORMAT_IL_SPIRV,
-                                   "-g -cl-opt-disable", nullptr);
+  auto module =
+      lzt::create_module(device_0, "debug_transform.spv",
+                         ZE_MODULE_FORMAT_IL_SPIRV, "-g -cl-opt-disable");
   auto kernel = lzt::create_function(module, "transform_kernel");
 
   auto device_idx = 0;
@@ -1055,8 +1054,7 @@ void multidevice_resource_stress_test(ze_context_handle_t &context,
   lzt::reset_command_list(command_list_1);
 
   module = lzt::create_module(device_1, "debug_transform.spv",
-                              ZE_MODULE_FORMAT_IL_SPIRV, "-g -cl-opt-disable",
-                              nullptr);
+                              ZE_MODULE_FORMAT_IL_SPIRV, "-g -cl-opt-disable");
   kernel = lzt::create_function(module, "transform_kernel");
 
   device_idx = 1;
diff --git a/conformance_tests/tools/metrics/src/test_metric_utils.cpp b/conformance_tests/tools/metrics/src/test_metric_utils.cpp
index 745a2f078..65be87415 100644
--- a/conformance_tests/tools/metrics/src/test_metric_utils.cpp
+++ b/conformance_tests/tools/metrics/src/test_metric_utils.cpp
@@ -50,8 +50,7 @@ ze_kernel_handle_t get_matrix_multiplication_kernel(
   tg->groupCountZ = 1;
 
   ze_module_handle_t module =
-      lzt::create_module(device, "ze_matrix_multiplication_metrics.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(device, "ze_matrix_multiplication_metrics.spv");
   ze_kernel_handle_t function =
       lzt::create_function(module, "matrix_multiplication");
   lzt::set_group_size(function, 16, 16, 1);
diff --git a/conformance_tests/tools/pin/src/test_pin.cpp b/conformance_tests/tools/pin/src/test_pin.cpp
index 3158d5b65..8d3715762 100644
--- a/conformance_tests/tools/pin/src/test_pin.cpp
+++ b/conformance_tests/tools/pin/src/test_pin.cpp
@@ -38,7 +38,7 @@ LZT_TEST(
 
     auto module = lzt::create_module(context, device, "profile_module.spv",
                                      ZE_MODULE_FORMAT_IL_SPIRV,
-                                     build_string.str().c_str(), nullptr);
+                                     build_string.str().c_str());
 
     auto kernel = lzt::create_function(module, "blackscholes");
 
@@ -66,9 +66,9 @@ LZT_TEST(
     auto context = lzt::create_context(driver);
     auto device = lzt::get_default_device(driver);
 
-    auto module = lzt::create_module(context, device, "profile_module.spv",
-                                     ZE_MODULE_FORMAT_IL_SPIRV,
-                                     buildString.c_str(), nullptr);
+    auto module =
+        lzt::create_module(context, device, "profile_module.spv",
+                           ZE_MODULE_FORMAT_IL_SPIRV, buildString.c_str());
 
     auto kernel = lzt::create_function(module, "blackscholes");
 
diff --git a/stress_tests/test_atomics/src/test_atomics.cpp b/stress_tests/test_atomics/src/test_atomics.cpp
index a49405d36..091a6eba4 100644
--- a/stress_tests/test_atomics/src/test_atomics.cpp
+++ b/stress_tests/test_atomics/src/test_atomics.cpp
@@ -99,7 +99,7 @@ LZT_TEST_P(zeDriverAtomicsStressTest, RunAtomicWithMemoryLimit) {
   LOG_INFO << "call create module";
   ze_module_handle_t module_handle = lzt::create_module(
       context, device, module_name, ZE_MODULE_FORMAT_IL_SPIRV,
-      "-ze-opt-greater-than-4GB-buffer-required", nullptr);
+      "-ze-opt-greater-than-4GB-buffer-required");
 
   LOG_INFO << "call create kernel";
   ze_kernel_handle_t test_function =
diff --git a/stress_tests/test_commands_overloading/src/test_commands_overloading.cpp b/stress_tests/test_commands_overloading/src/test_commands_overloading.cpp
index 04f652d59..cf242a808 100644
--- a/stress_tests/test_commands_overloading/src/test_commands_overloading.cpp
+++ b/stress_tests/test_commands_overloading/src/test_commands_overloading.cpp
@@ -334,7 +334,7 @@ LZT_TEST_P(
       LOG_DEBUG << "call create module";
       ze_module_handle_t module_handle = lzt::create_module(
           context, device, kernel_file_name, ZE_MODULE_FORMAT_IL_SPIRV,
-          "-ze-opt-greater-than-4GB-buffer-required", nullptr);
+          "-ze-opt-greater-than-4GB-buffer-required");
       multiple_module_handle.push_back(module_handle);
     }
   }
@@ -342,7 +342,7 @@ LZT_TEST_P(
   LOG_INFO << "call create module";
   ze_module_handle_t module_handle = lzt::create_module(
       context, device, kernel_file_name, ZE_MODULE_FORMAT_IL_SPIRV,
-      "-ze-opt-greater-than-4GB-buffer-required", nullptr);
+      "-ze-opt-greater-than-4GB-buffer-required");
 
   LOG_INFO << "call dispatch_kernels";
   dispatch_kernels(device, multiple_module_handle, output_allocations,
diff --git a/stress_tests/test_commands_overloading/src/test_commands_overloading_events.cpp b/stress_tests/test_commands_overloading/src/test_commands_overloading_events.cpp
index 76a8da460..16b7c1d2d 100644
--- a/stress_tests/test_commands_overloading/src/test_commands_overloading_events.cpp
+++ b/stress_tests/test_commands_overloading/src/test_commands_overloading_events.cpp
@@ -135,10 +135,9 @@ LZT_TEST_P(zeDriverMultiplyEventsStressTest, RunKernelDispatchesUsingEvents) {
 
   LOG_INFO << "call create modules, kernels, events, set command lists.";
   uint64_t dispatch_id = 0;
-  ze_module_handle_t module_handle =
-      lzt::create_module(context, device, "test_commands_overloading.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV,
-                         "-ze-opt-greater-than-4GB-buffer-required", nullptr);
+  ze_module_handle_t module_handle = lzt::create_module(
+      context, device, "test_commands_overloading.spv",
+      ZE_MODULE_FORMAT_IL_SPIRV, "-ze-opt-greater-than-4GB-buffer-required");
   std::string kernel_name = "test_device_memory1";
   ze_kernel_handle_t kernel_handle =
       create_kernel(module_handle, kernel_name, output_allocations,
diff --git a/stress_tests/test_commands_overloading/src/test_commands_overloading_multiplication.cpp b/stress_tests/test_commands_overloading/src/test_commands_overloading_multiplication.cpp
index e9c905f62..119c44f98 100644
--- a/stress_tests/test_commands_overloading/src/test_commands_overloading_multiplication.cpp
+++ b/stress_tests/test_commands_overloading/src/test_commands_overloading_multiplication.cpp
@@ -101,10 +101,10 @@ class zeDriverMultiplyObjectsStressTest
       std::vector<ze_kernel_handle_t> &multiple_kernel_handle) {
     for (uint64_t module_id = 0; module_id < test_arguments.multiply_modules;
          module_id++) {
-      ze_module_handle_t module_handle = lzt::create_module(
-          context, device, "test_commands_overloading.spv",
-          ZE_MODULE_FORMAT_IL_SPIRV, "-ze-opt-greater-than-4GB-buffer-required",
-          nullptr);
+      ze_module_handle_t module_handle =
+          lzt::create_module(context, device, "test_commands_overloading.spv",
+                             ZE_MODULE_FORMAT_IL_SPIRV,
+                             "-ze-opt-greater-than-4GB-buffer-required");
       multiple_module_handle.push_back(module_handle);
       for (uint64_t kernel_id = 0; kernel_id < test_arguments.multiply_kernels;
            kernel_id++) {
diff --git a/stress_tests/test_memory_allocation/src/test_memory_allocation.cpp b/stress_tests/test_memory_allocation/src/test_memory_allocation.cpp
index f1ba65512..7d9a79c78 100644
--- a/stress_tests/test_memory_allocation/src/test_memory_allocation.cpp
+++ b/stress_tests/test_memory_allocation/src/test_memory_allocation.cpp
@@ -318,8 +318,7 @@ LZT_TEST_P(
   LOG_INFO << "call create module";
   ze_module_handle_t module_handle = lzt::create_module(
       context, device, "test_multiple_memory_allocations.spv",
-      ZE_MODULE_FORMAT_IL_SPIRV, "-ze-opt-greater-than-4GB-buffer-required",
-      nullptr);
+      ZE_MODULE_FORMAT_IL_SPIRV, "-ze-opt-greater-than-4GB-buffer-required");
 
   LOG_INFO << "call dispatch_kernels";
   dispatch_kernels(device, test_arguments_.memory_type, module_handle,
diff --git a/stress_tests/test_misc/src/test_memory_reservation_57b.cpp b/stress_tests/test_misc/src/test_memory_reservation_57b.cpp
index ecc755412..bb5e16c3e 100644
--- a/stress_tests/test_misc/src/test_memory_reservation_57b.cpp
+++ b/stress_tests/test_misc/src/test_memory_reservation_57b.cpp
@@ -38,8 +38,7 @@ LZT_TEST_F(zeRunDriverIn57bAddressSpace, CheckIfKernelCanBeExecuted) {
 
   std::string kernel_name = "simple_test";
   ze_module_handle_t module_handle =
-      lzt::create_module(context, device, "test_memory_reservation_57b.spv",
-                         ZE_MODULE_FORMAT_IL_SPIRV, nullptr, nullptr);
+      lzt::create_module(context, device, "test_memory_reservation_57b.spv");
   ze_command_list_handle_t command_list =
       lzt::create_command_list(context, device, 0);
   ze_kernel_handle_t kernel_handle =
diff --git a/utils/test_harness/include/test_harness/test_harness_module.hpp b/utils/test_harness/include/test_harness/test_harness_module.hpp
index eee50b1d3..dbdb124aa 100644
--- a/utils/test_harness/include/test_harness/test_harness_module.hpp
+++ b/utils/test_harness/include/test_harness/test_harness_module.hpp
@@ -29,11 +29,23 @@ create_program_module(ze_context_handle_t context, ze_device_handle_t device,
 
 ze_module_handle_t create_module(ze_device_handle_t device,
                                  const std::string filename);
+ze_module_handle_t create_module(ze_device_handle_t device,
+                                 const std::string filename,
+                                 const ze_module_format_t format,
+                                 const char *build_flags);
 ze_module_handle_t create_module(ze_device_handle_t device,
                                  const std::string filename,
                                  const ze_module_format_t format,
                                  const char *build_flags,
-                                 ze_module_build_log_handle_t *phBuildLog);
+                                 ze_module_build_log_handle_t *p_build_log);
+ze_module_handle_t create_module(ze_context_handle_t context,
+                                 ze_device_handle_t device,
+                                 const std::string filename);
+ze_module_handle_t create_module(ze_context_handle_t context,
+                                 ze_device_handle_t device,
+                                 const std::string filename,
+                                 const ze_module_format_t format,
+                                 const char *build_flags);
 ze_module_handle_t create_module(ze_context_handle_t context,
                                  ze_device_handle_t device,
                                  const std::string filename,
diff --git a/utils/test_harness/src/test_harness_module.cpp b/utils/test_harness/src/test_harness_module.cpp
index 5f1767d1f..da4c99020 100644
--- a/utils/test_harness/src/test_harness_module.cpp
+++ b/utils/test_harness/src/test_harness_module.cpp
@@ -6,6 +6,7 @@
  *
  */
 
+#include "test_harness/test_harness_module.hpp"
 #include "test_harness/test_harness.hpp"
 #include "utils/utils.hpp"
 #include "gtest/gtest.h"
@@ -57,9 +58,19 @@ create_program_module(ze_context_handle_t context, ze_device_handle_t device,
   auto device_initial = device;
   auto context_initial = context;
 
-  ze_module_handle_t module;
-  EXPECT_ZE_RESULT_SUCCESS(
-      zeModuleCreate(context, device, &module_description, &module, nullptr));
+  ze_module_handle_t module = nullptr;
+  ze_result_t result = ZE_RESULT_ERROR_UNKNOWN;
+  ze_module_build_log_handle_t p_build_log = nullptr;
+  result = zeModuleCreate(context, device, &module_description, &module,
+                          &p_build_log);
+  if (result != ZE_RESULT_SUCCESS) {
+    LOG_ERROR << lzt::get_build_log_string(p_build_log);
+  }
+  if (p_build_log != nullptr) {
+    lzt::destroy_build_log(p_build_log);
+  }
+
+  EXPECT_ZE_RESULT_SUCCESS(result);
   EXPECT_EQ(context, context_initial);
   EXPECT_EQ(device, device_initial);
 
@@ -71,11 +82,36 @@ create_program_module(ze_context_handle_t context, ze_device_handle_t device,
 
 #endif
 
+ze_module_handle_t create_module(ze_context_handle_t context,
+                                 ze_device_handle_t device,
+                                 const std::string filename) {
+  return create_module(context, device, filename, ZE_MODULE_FORMAT_IL_SPIRV,
+                       "");
+}
 ze_module_handle_t create_module(ze_device_handle_t device,
                                  const std::string filename) {
+  return create_module(lzt::get_default_context(), device, filename,
+                       ZE_MODULE_FORMAT_IL_SPIRV, "");
+}
+ze_module_handle_t create_module(ze_device_handle_t device,
+                                 const std::string filename,
+                                 const ze_module_format_t format,
+                                 const char *build_flags) {
+  return create_module(lzt::get_default_context(), device, filename, format,
+                       build_flags);
+}
 
-  return (
-      create_module(device, filename, ZE_MODULE_FORMAT_IL_SPIRV, "", nullptr));
+ze_module_handle_t create_module(ze_context_handle_t context,
+                                 ze_device_handle_t device,
+                                 const std::string filename,
+                                 const ze_module_format_t format,
+                                 const char *build_flags) {
+  ze_module_build_log_handle_t build_log = nullptr;
+  return create_module(context, device, filename, format, build_flags,
+                       &build_log);
+  if (build_log != nullptr) {
+    lzt::destroy_build_log(build_log);
+  }
 }
 
 ze_module_handle_t create_module(ze_device_handle_t device,
@@ -125,6 +161,10 @@ ze_module_handle_t create_module(ze_context_handle_t context,
   auto device_initial = device;
   *build_result = zeModuleCreate(context, device, &module_description, &module,
                                  p_build_log);
+  if (*build_result != ZE_RESULT_SUCCESS && p_build_log != nullptr &&
+      *p_build_log != nullptr) {
+    LOG_ERROR << lzt::get_build_log_string(*p_build_log);
+  }
   EXPECT_ZE_RESULT_SUCCESS(*build_result);
   EXPECT_EQ(context, context_initial);
   EXPECT_EQ(device, device_initial);
@@ -156,7 +196,11 @@ std::string get_build_log_string(ze_module_build_log_handle_t build_log) {
 }
 
 void dynamic_link(uint32_t num_modules, ze_module_handle_t *modules) {
-  dynamic_link(num_modules, modules, nullptr);
+  ze_module_build_log_handle_t link_log = nullptr;
+  dynamic_link(num_modules, modules, &link_log);
+  if (link_log != nullptr) {
+    lzt::destroy_build_log(link_log);
+  }
 }
 
 void dynamic_link(uint32_t num_modules, ze_module_handle_t *modules,
@@ -171,6 +215,10 @@ void dynamic_link(uint32_t num_modules, ze_module_handle_t *modules,
   memcpy(modules_initial.data(), modules,
          sizeof(ze_module_handle_t) * num_modules);
   *result = zeModuleDynamicLink(num_modules, modules, link_log);
+  if (*result != ZE_RESULT_SUCCESS && link_log != nullptr &&
+      *link_log != nullptr) {
+    LOG_ERROR << lzt::get_build_log_string(*link_log);
+  }
   EXPECT_ZE_RESULT_SUCCESS(*result);
   for (uint32_t i = 0U; i < num_modules; i++) {
     EXPECT_EQ(modules[i], modules_initial[i]);