diff --git a/test/conformance/enqueue/enqueue_adapter_cuda.match b/test/conformance/enqueue/enqueue_adapter_cuda.match
index 8d015c3dc7..381612066d 100644
--- a/test/conformance/enqueue/enqueue_adapter_cuda.match
+++ b/test/conformance/enqueue/enqueue_adapter_cuda.match
@@ -1,58 +1,10 @@
 urEnqueueKernelLaunchTest.InvalidKernelArgs/NVIDIA_CUDA_BACKEND___{{.*}}_
 urEnqueueKernelLaunchKernelWgSizeTest.NonMatchingLocalSize/NVIDIA_CUDA_BACKEND___{{.*}}_
 urEnqueueKernelLaunchKernelSubGroupTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueKernelLaunchWithVirtualMemory.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemBufferCopyRectTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemBufferFillTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___size__256__patternSize__256
-{{OPT}}urEnqueueMemBufferFillTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___size__1024__patternSize__256
-{{OPT}}urEnqueueMemBufferReadRectTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemBufferWriteRectTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___1D
-{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___2D
-{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___3D
-{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin1D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin2D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin3D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageReadTest.InvalidRegion1D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageReadTest.InvalidRegion2D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageReadTest.InvalidRegion3D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin1D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin2D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin3D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion1D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion2D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion3D/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1__patternSize__1
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1__patternSize__256
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1__patternSize__4
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__57__height__1__patternSize__1
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1__patternSize__256
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1__patternSize__1024
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256__patternSize__1
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256__patternSize__256
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256__patternSize__65536
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__1__patternSize__1
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__35__patternSize__1
-{{OPT}}urEnqueueUSMFill2DTestWithParam.Success/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__35__patternSize__128
-{{OPT}}urEnqueueUSMFill2DNegativeTest.OutOfBounds/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueUSMAdviseWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
-{{OPT}}urEnqueueUSMAdviseTest.MultipleParamsSuccess/NVIDIA_CUDA_BACKEND___{{.*}}_
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__23
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__1
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__1
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__1024__height__1
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1024__width__256__height__256
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__23
-{{OPT}}urEnqueueUSMMemcpy2DTestWithParam.SuccessNonBlocking/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__234__width__233__height__1
-{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidNullHandleQueue/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
-{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidNullPointer/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
-{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidSize/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
-{{OPT}}urEnqueueUSMMemcpy2DNegativeTest.InvalidEventWaitList/NVIDIA_CUDA_BACKEND___{{.*}}___pitch__1__width__1__height__1
-{{OPT}}urEnqueueUSMPrefetchWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
-{{OPT}}urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
-{{OPT}}{{Segmentation fault|Aborted}}
+urEnqueueMemBufferMapTestWithWriteFlagParam.SuccessWrite/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MAP_FLAG_WRITE_INVALIDATE_REGION
+urEnqueueUSMAdviseWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
+urEnqueueUSMAdviseTest.MultipleParamsSuccess/NVIDIA_CUDA_BACKEND___{{.*}}_
+urEnqueueUSMPrefetchWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
+urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
+urEnqueueTimestampRecordingExpTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
+urEnqueueTimestampRecordingExpTest.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}_
diff --git a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
index 88b65348dc..79c8ac14da 100644
--- a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
+++ b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
@@ -364,7 +364,7 @@ TEST_P(urEnqueueKernelLaunchWithVirtualMemory, Success) {
     size_t global_size = alloc_size / sizeof(uint32_t);
     uint32_t fill_val = 42;
 
-    ASSERT_SUCCESS(urKernelSetArgPointer(kernel, 0, nullptr, virtual_ptr));
+    ASSERT_SUCCESS(urKernelSetArgPointer(kernel, 0, nullptr, &virtual_ptr));
     ASSERT_SUCCESS(
         urKernelSetArgValue(kernel, 1, sizeof(fill_val), nullptr, &fill_val));