diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDtoH.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp
similarity index 88%
rename from hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDtoH.cpp
rename to hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp
index 568ecb9c35..ccb02b74ce 100644
--- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDtoH.cpp
+++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoD.cpp
@@ -51,11 +51,11 @@ int main()
 
         
         HIPCHECK(hipSetDevice(0));
-        HIPCHECK ( hipMemcpy(A_d, A_h, Nbytes, hipMemcpyHostToDevice));
-        HIPCHECK ( hipMemcpy(B_d, B_h, Nbytes, hipMemcpyHostToDevice));
+        HIPCHECK(hipMemcpy(A_d, A_h, Nbytes, hipMemcpyHostToDevice));
+        HIPCHECK(hipMemcpy(B_d, B_h, Nbytes, hipMemcpyHostToDevice));
         hipLaunchKernel(HipTest::vectorADD, dim3(blocks), dim3(threadsPerBlock), 0, 0, A_d,B_d, C_d, N);
-        HIPCHECK ( hipMemcpy(C_h, C_d, Nbytes, hipMemcpyDeviceToHost));
-        HIPCHECK (hipDeviceSynchronize());
+        HIPCHECK(hipMemcpy(C_h, C_d, Nbytes, hipMemcpyDeviceToHost));
+        HIPCHECK(hipDeviceSynchronize());
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
     
          
@@ -69,6 +69,9 @@ int main()
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
 
         HipTest::freeArrays(A_d, B_d, C_d, A_h, B_h, C_h, false);
+        HIPCHECK(hipFree(X_d));
+        HIPCHECK(hipFree(Y_d));
+        HIPCHECK(hipFree(Z_d));
       }
      
         passed();
diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDtoHAsync.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp
similarity index 88%
rename from hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDtoHAsync.cpp
rename to hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp
index 036ec16529..5c99b43564 100644
--- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDtoHAsync.cpp
+++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp
@@ -52,11 +52,11 @@ int main()
 
         
         HIPCHECK(hipSetDevice(0));
-        HIPCHECK ( hipMemcpy(A_d, A_h, Nbytes, hipMemcpyHostToDevice));
-        HIPCHECK ( hipMemcpy(B_d, B_h, Nbytes, hipMemcpyHostToDevice));
+        HIPCHECK(hipMemcpy(A_d, A_h, Nbytes, hipMemcpyHostToDevice));
+        HIPCHECK(hipMemcpy(B_d, B_h, Nbytes, hipMemcpyHostToDevice));
         hipLaunchKernel(HipTest::vectorADD, dim3(blocks), dim3(threadsPerBlock), 0, 0, A_d,B_d, C_d, N);
-        HIPCHECK ( hipMemcpy(C_h, C_d, Nbytes, hipMemcpyDeviceToHost));
-        HIPCHECK (hipDeviceSynchronize());
+        HIPCHECK(hipMemcpy(C_h, C_d, Nbytes, hipMemcpyDeviceToHost));
+        HIPCHECK(hipDeviceSynchronize());
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
     
         HIPCHECK(hipStreamCreate(&s));    
@@ -70,8 +70,11 @@ int main()
         HIPCHECK(hipDeviceSynchronize());
         
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
-
+        HIPCHECK(hipStreamDestroy(s));
         HipTest::freeArrays(A_d, B_d, C_d, A_h, B_h, C_h, false);
+        HIPCHECK(hipFree(X_d));
+        HIPCHECK(hipFree(Y_d));
+        HIPCHECK(hipFree(Z_d));
      }
 
         passed();
diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeer.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeer.cpp
index dc2ba78ae0..7e2fc2d3d0 100644
--- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeer.cpp
+++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeer.cpp
@@ -48,25 +48,28 @@ int main()
         HIPCHECK(hipMalloc(&X_d,Nbytes));
         HIPCHECK(hipMalloc(&Y_d,Nbytes));
         HIPCHECK(hipMalloc(&Z_d,Nbytes));
-
         
         HIPCHECK(hipSetDevice(0));
-        HIPCHECK ( hipMemcpy(A_d, A_h, Nbytes, hipMemcpyHostToDevice));
-        HIPCHECK ( hipMemcpy(B_d, B_h, Nbytes, hipMemcpyHostToDevice));
+        HIPCHECK(hipMemcpy(A_d, A_h, Nbytes, hipMemcpyHostToDevice));
+        HIPCHECK(hipMemcpy(B_d, B_h, Nbytes, hipMemcpyHostToDevice));
         hipLaunchKernel(HipTest::vectorADD, dim3(blocks), dim3(threadsPerBlock), 0, 0, A_d,B_d, C_d, N);
-        HIPCHECK ( hipMemcpy(C_h, C_d, Nbytes, hipMemcpyDeviceToHost));
-        HIPCHECK (hipDeviceSynchronize());
+        HIPCHECK(hipMemcpy(C_h, C_d, Nbytes, hipMemcpyDeviceToHost));
+        HIPCHECK(hipDeviceSynchronize());
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
-    
-         
+             
         HIPCHECK(hipSetDevice(1));
         hipMemcpyPeer(X_d, 1, A_d, 0, Nbytes); //this call is eqv to hipMemcpy(hipMemcpyD2D) which goes via stg bufs.
         hipMemcpyPeer(Y_d, 1, B_d, 0, Nbytes);
 
         hipLaunchKernel(HipTest::vectorADD, dim3(blocks), dim3(threadsPerBlock), 0, 0, X_d,Y_d, Z_d, N);
-        HIPCHECK ( hipMemcpy(C_h, Z_d, Nbytes, hipMemcpyDeviceToHost));
-        HIPCHECK (hipDeviceSynchronize());
+        HIPCHECK(hipMemcpy(C_h, Z_d, Nbytes, hipMemcpyDeviceToHost));
+        HIPCHECK(hipDeviceSynchronize());
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
+        
+        HipTest::freeArrays(A_d, B_d, C_d, A_h, B_h, C_h, false);
+        HIPCHECK(hipFree(X_d));
+        HIPCHECK(hipFree(Y_d));
+        HIPCHECK(hipFree(Z_d));
      }
         passed();
 
diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp
index 1f0108c7cb..9d46ccb0d8 100644
--- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp
+++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp
@@ -70,6 +70,12 @@ int main()
         HIPCHECK (hipDeviceSynchronize());
         HIPCHECK (hipStreamSynchronize(s));
         HipTest::checkVectorADD(A_h, B_h, C_h, N);
+        
+        HIPCHECK(hipStreamDestroy(s));
+        HipTest::freeArrays(A_d, B_d, C_d, A_h, B_h, C_h, false);
+        HIPCHECK(hipFree(X_d));
+        HIPCHECK(hipFree(Y_d));
+        HIPCHECK(hipFree(Z_d));
      }
 
         passed();