diff --git a/engine/src/RHI/D3D12/D3D12CommandQueue.cpp b/engine/src/RHI/D3D12/D3D12CommandQueue.cpp
index 7c5a43ce..0183bd92 100644
--- a/engine/src/RHI/D3D12/D3D12CommandQueue.cpp
+++ b/engine/src/RHI/D3D12/D3D12CommandQueue.cpp
@@ -59,7 +59,7 @@ void D3D12CommandQueue::ExecuteCommandLists(uint32_t count, void** lists) {
     std::vector<ID3D12CommandList*> cmdLists(count);
     for (uint32_t i = 0; i < count; ++i) {
         if (lists[i]) {
-            RHICommandList* cmdList = static_cast<RHICommandList*>(lists[i]);
+            auto* cmdList = static_cast<RHICommandList*>(lists[i]);
             cmdLists[i] = static_cast<ID3D12CommandList*>(cmdList->GetNativeHandle());
         }
     }
diff --git a/tests/RHI/D3D12/integration/minimal/main.cpp b/tests/RHI/D3D12/integration/minimal/main.cpp
index 269756d0..8b34839c 100644
--- a/tests/RHI/D3D12/integration/minimal/main.cpp
+++ b/tests/RHI/D3D12/integration/minimal/main.cpp
@@ -151,7 +151,7 @@ void WaitForGPU() {
 // Execute command list
 void ExecuteCommandList() {
     gCommandList.Close();
-    void* commandLists[] = { gCommandList.GetCommandList() };
+    void* commandLists[] = { &gCommandList };
     gCommandQueue.ExecuteCommandLists(1, commandLists);
 }
 
diff --git a/tests/RHI/D3D12/integration/quad/CMakeLists.txt b/tests/RHI/D3D12/integration/quad/CMakeLists.txt
index a619a592..bf16ba6f 100644
--- a/tests/RHI/D3D12/integration/quad/CMakeLists.txt
+++ b/tests/RHI/D3D12/integration/quad/CMakeLists.txt
@@ -48,6 +48,9 @@ add_custom_command(TARGET d3d12_quad_test POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
         $<TARGET_FILE_DIR:d3d12_quad_test>/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
+        $<TARGET_FILE_DIR:d3d12_quad_test>/
 )
 
 add_test(NAME d3d12_quad_test
diff --git a/tests/RHI/D3D12/integration/quad/main.cpp b/tests/RHI/D3D12/integration/quad/main.cpp
index 93d788be..0651b7c7 100644
--- a/tests/RHI/D3D12/integration/quad/main.cpp
+++ b/tests/RHI/D3D12/integration/quad/main.cpp
@@ -282,7 +282,7 @@ void WaitForGPU() {
 
 void ExecuteCommandList() {
     gCommandList.Close();
-    void* commandLists[] = { gCommandList.GetCommandList() };
+    void* commandLists[] = { &gCommandList };
     gCommandQueue.ExecuteCommandLists(1, commandLists);
 }
 
diff --git a/tests/RHI/D3D12/integration/sphere/CMakeLists.txt b/tests/RHI/D3D12/integration/sphere/CMakeLists.txt
index 7185247f..20113737 100644
--- a/tests/RHI/D3D12/integration/sphere/CMakeLists.txt
+++ b/tests/RHI/D3D12/integration/sphere/CMakeLists.txt
@@ -46,6 +46,9 @@ add_custom_command(TARGET d3d12_sphere_test POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
         $<TARGET_FILE_DIR:d3d12_sphere_test>/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
+        $<TARGET_FILE_DIR:d3d12_sphere_test>/
 )
 
 add_test(NAME d3d12_sphere_test
diff --git a/tests/RHI/D3D12/integration/sphere/main.cpp b/tests/RHI/D3D12/integration/sphere/main.cpp
index c6f17f55..6c95fd10 100644
--- a/tests/RHI/D3D12/integration/sphere/main.cpp
+++ b/tests/RHI/D3D12/integration/sphere/main.cpp
@@ -370,7 +370,7 @@ void WaitForGPU() {
 
 void ExecuteCommandList() {
     gCommandList.Close();
-    void* commandLists[] = { gCommandList.GetCommandList() };
+    void* commandLists[] = { &gCommandList };
     gCommandQueue.ExecuteCommandLists(1, commandLists);
 }
 
diff --git a/tests/RHI/D3D12/integration/triangle/CMakeLists.txt b/tests/RHI/D3D12/integration/triangle/CMakeLists.txt
index ee1e9df9..8740b2ce 100644
--- a/tests/RHI/D3D12/integration/triangle/CMakeLists.txt
+++ b/tests/RHI/D3D12/integration/triangle/CMakeLists.txt
@@ -45,6 +45,9 @@ add_custom_command(TARGET d3d12_triangle_test POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
         $<TARGET_FILE_DIR:d3d12_triangle_test>/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
+        $<TARGET_FILE_DIR:d3d12_triangle_test>/
 )
 
 add_test(NAME d3d12_triangle_test
diff --git a/tests/RHI/D3D12/integration/triangle/main.cpp b/tests/RHI/D3D12/integration/triangle/main.cpp
index e3a9fe39..f86d05d2 100644
--- a/tests/RHI/D3D12/integration/triangle/main.cpp
+++ b/tests/RHI/D3D12/integration/triangle/main.cpp
@@ -217,7 +217,7 @@ void WaitForGPU() {
 
 void ExecuteCommandList() {
     gCommandList.Close();
-    void* commandLists[] = { gCommandList.GetCommandList() };
+    void* commandLists[] = { &gCommandList };
     gCommandQueue.ExecuteCommandLists(1, commandLists);
 }
 
diff --git a/tests/RHI/OpenGL/integration/quad/CMakeLists.txt b/tests/RHI/OpenGL/integration/quad/CMakeLists.txt
index e605a212..d58f953f 100644
--- a/tests/RHI/OpenGL/integration/quad/CMakeLists.txt
+++ b/tests/RHI/OpenGL/integration/quad/CMakeLists.txt
@@ -45,6 +45,9 @@ add_custom_command(TARGET opengl_quad_test POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
         $<TARGET_FILE_DIR:opengl_quad_test>/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
+        $<TARGET_FILE_DIR:opengl_quad_test>/
 )
 
 add_test(NAME opengl_quad_test
diff --git a/tests/RHI/OpenGL/integration/sphere/CMakeLists.txt b/tests/RHI/OpenGL/integration/sphere/CMakeLists.txt
index 596ac57b..ae802d59 100644
--- a/tests/RHI/OpenGL/integration/sphere/CMakeLists.txt
+++ b/tests/RHI/OpenGL/integration/sphere/CMakeLists.txt
@@ -45,6 +45,9 @@ add_custom_command(TARGET opengl_sphere_test POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
         $<TARGET_FILE_DIR:opengl_sphere_test>/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
+        $<TARGET_FILE_DIR:opengl_sphere_test>/
 )
 
 add_test(NAME opengl_sphere_test
diff --git a/tests/RHI/OpenGL/integration/triangle/CMakeLists.txt b/tests/RHI/OpenGL/integration/triangle/CMakeLists.txt
index 27c95541..0fe9bb13 100644
--- a/tests/RHI/OpenGL/integration/triangle/CMakeLists.txt
+++ b/tests/RHI/OpenGL/integration/triangle/CMakeLists.txt
@@ -45,6 +45,9 @@ add_custom_command(TARGET opengl_triangle_test POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_SOURCE_DIR}/GT.ppm
         $<TARGET_FILE_DIR:opengl_triangle_test>/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${ENGINE_ROOT_DIR}/third_party/renderdoc/renderdoc.dll
+        $<TARGET_FILE_DIR:opengl_triangle_test>/
 )
 
 add_test(NAME opengl_triangle_test