diff --git a/tests/src/deviceLib/hipSimpleAtomicsTest.cpp b/tests/src/deviceLib/hipSimpleAtomicsTest.cpp
index 029191aebf..760d65e555 100644
--- a/tests/src/deviceLib/hipSimpleAtomicsTest.cpp
+++ b/tests/src/deviceLib/hipSimpleAtomicsTest.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 --gpu-architecture=sm_60 EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 --gpu-architecture=sm_60
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/deviceLib/hip_anyall.cpp b/tests/src/deviceLib/hip_anyall.cpp
index aa27d106b7..c77a3cd25d 100644
--- a/tests/src/deviceLib/hip_anyall.cpp
+++ b/tests/src/deviceLib/hip_anyall.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/deviceLib/hip_ballot.cpp b/tests/src/deviceLib/hip_ballot.cpp
index 3728575e80..324047a6b1 100644
--- a/tests/src/deviceLib/hip_ballot.cpp
+++ b/tests/src/deviceLib/hip_ballot.cpp
@@ -18,7 +18,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --Wno-deprecated-declarations
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/deviceLib/hip_test_ldg.cpp b/tests/src/deviceLib/hip_test_ldg.cpp
index ccd87c4661..0f97c1f0ad 100644
--- a/tests/src/deviceLib/hip_test_ldg.cpp
+++ b/tests/src/deviceLib/hip_test_ldg.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --gpu-architecture=sm_35 EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS --gpu-architecture=sm_35
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/hipHcc.cpp b/tests/src/hipHcc.cpp
index 5ebc2b820f..9bcc999b34 100644
--- a/tests/src/hipHcc.cpp
+++ b/tests/src/hipHcc.cpp
@@ -22,7 +22,7 @@ THE SOFTWARE.
 // Test the HCC-specific API extensions for HIP:
 
 /* HIT_START
- * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t EXCLUDE_HIP_PLATFORM all
  * HIT_END
  */
diff --git a/tests/src/kernel/hipDynamicShared.cpp b/tests/src/kernel/hipDynamicShared.cpp
index 0da709f01c..d9a5942085 100644
--- a/tests/src/kernel/hipDynamicShared.cpp
+++ b/tests/src/kernel/hipDynamicShared.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc
  * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
diff --git a/tests/src/kernel/hipDynamicShared2.cpp b/tests/src/kernel/hipDynamicShared2.cpp
index 2674f2eb84..11f0640537 100644
--- a/tests/src/kernel/hipDynamicShared2.cpp
+++ b/tests/src/kernel/hipDynamicShared2.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc
  * TEST: %t EXCLUDE_HIP_PLATFORM nvcc
  * HIT_END
  */
diff --git a/tests/src/kernel/hipExtLaunchKernelGGL.cpp b/tests/src/kernel/hipExtLaunchKernelGGL.cpp
index 61a663b91c..39c660322b 100644
--- a/tests/src/kernel/hipExtLaunchKernelGGL.cpp
+++ b/tests/src/kernel/hipExtLaunchKernelGGL.cpp
@@ -19,7 +19,7 @@ THE SOFTWARE.
 // Test the Grid_Launch syntax.
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/runtimeApi/memory/hipMemset2D.cpp b/tests/src/runtimeApi/memory/hipMemset2D.cpp
index 83c73416a3..e7fe932b3d 100644
--- a/tests/src/runtimeApi/memory/hipMemset2D.cpp
+++ b/tests/src/runtimeApi/memory/hipMemset2D.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 // Also serves as a template for other tests.
 
 /* HIT_START
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../../test_common.cpp
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp b/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
index 3c85a8afea..f4c72ca1c5 100755
--- a/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
+++ b/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp
@@ -18,8 +18,8 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc vdi
- * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi
+ * BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc
+ * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
  * TEST: %t
  * HIT_END
  */
diff --git a/tests/src/texture/simpleTexture2DLayered.cpp b/tests/src/texture/simpleTexture2DLayered.cpp
index f4d3aac1e5..e72ea3483a 100644
--- a/tests/src/texture/simpleTexture2DLayered.cpp
+++ b/tests/src/texture/simpleTexture2DLayered.cpp
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 /* HIT_START
- * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM vdi
+ * BUILD: %t %s ../test_common.cpp
  * TEST: %t
  * HIT_END
  */
@@ -66,7 +66,7 @@ void runTest(int width,int height,int num_layers,texture<T, hipTextureType2DLaye
     myparms.srcPtr = make_hipPitchedPtr(hData, width * sizeof(T), width, height);
     myparms.dstArray = arr;
     myparms.extent = make_hipExtent(width , height, num_layers);
-    //myparms.kind = hipMemcpyHostToDevice;
+    myparms.kind = hipMemcpyHostToDevice;
     HIPCHECK(hipMemcpy3D(&myparms));
 
     // set texture parameters
diff --git a/vdi/hip_memory.cpp b/vdi/hip_memory.cpp
index 7b4fece3b2..33f3e150d3 100644
--- a/vdi/hip_memory.cpp
+++ b/vdi/hip_memory.cpp
@@ -1568,6 +1568,7 @@ hipError_t ihipMemcpy3D(const hipMemcpy3DParms* p,
 
   if (p->srcArray != nullptr) {
     pCopy.srcMemoryType = hipMemoryTypeArray;
+    pCopy.srcArray = p->srcArray;
     // When reffering to array memory, hipPos::x is in elements.
     pCopy.srcXInBytes *= hip::getElementSize(p->dstArray->Format);
   }
@@ -1582,6 +1583,7 @@ hipError_t ihipMemcpy3D(const hipMemcpy3DParms* p,
 
   if (p->dstArray != nullptr) {
     pCopy.dstMemoryType = hipMemoryTypeArray;
+    pCopy.dstArray = p->dstArray;
     // When reffering to array memory, hipPos::x is in elements.
     pCopy.srcXInBytes *= hip::getElementSize(p->dstArray->Format);
   }