diff --git a/hpvm/projects/hpvm-tensor-rt/CMakeLists.txt b/hpvm/projects/hpvm-tensor-rt/CMakeLists.txt
index cbabc8bbe0111a0ec6c99520176a8b37a530a4fb..be42ebec07cc5aebad8ad975155f86cc25715dab 100644
--- a/hpvm/projects/hpvm-tensor-rt/CMakeLists.txt
+++ b/hpvm/projects/hpvm-tensor-rt/CMakeLists.txt
@@ -140,8 +140,12 @@ add_tensor_runtime(tensor_runtime_online -DONLINE_PROFILING=true -DFP16_tuning=f
 add_dependencies(tensor_runtime_online tensor_runtime)
 
 # Adding rule for the debugging source
-add_executable(unit_tests tests/unit_tests.cc)
-target_link_libraries(unit_tests tensor_runtime_online)
+add_executable(sampling_tests tests/sampling_tests.cc)
+target_link_libraries(sampling_tests tensor_runtime_online)
+
+add_executable(perforation_tests tests/perforation_tests.cc)
+target_link_libraries(perforation_tests tensor_runtime_online)
+
 
 # -- Compile tensor_runtime.ll if possible
 if(INDEP_BUILD)
diff --git a/hpvm/projects/hpvm-tensor-rt/tests/perforation_tests.cc b/hpvm/projects/hpvm-tensor-rt/tests/perforation_tests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c36a2c81d04a64398e106006c49746e0dd70037b
--- /dev/null
+++ b/hpvm/projects/hpvm-tensor-rt/tests/perforation_tests.cc
@@ -0,0 +1,16 @@
+
+#include "tests.h"
+
+
+int main() {
+
+  llvm_hpvm_initTensorRt(0);
+
+  UnitTestResults unitTestResults;
+  
+  testPerforation(unitTestResults);
+  
+  unitTestResults.printSummary();
+
+  return 0;
+}
diff --git a/hpvm/projects/hpvm-tensor-rt/tests/sampling_tests.cc b/hpvm/projects/hpvm-tensor-rt/tests/sampling_tests.cc
new file mode 100644
index 0000000000000000000000000000000000000000..087511413e56c7b8653ea5cb5d9798839af88ebb
--- /dev/null
+++ b/hpvm/projects/hpvm-tensor-rt/tests/sampling_tests.cc
@@ -0,0 +1,16 @@
+
+#include "tests.h"
+
+
+int main() {
+
+  llvm_hpvm_initTensorRt(0);
+
+  UnitTestResults unitTestResults;
+  
+  testSampling(unitTestResults); 
+  
+  unitTestResults.printSummary();
+
+  return 0;
+}
diff --git a/hpvm/projects/hpvm-tensor-rt/tests/unit_tests.cc b/hpvm/projects/hpvm-tensor-rt/tests/tests.h
similarity index 98%
rename from hpvm/projects/hpvm-tensor-rt/tests/unit_tests.cc
rename to hpvm/projects/hpvm-tensor-rt/tests/tests.h
index e60e455e5a3020ef00c7dd9a03c14744c69bcdea..d9bf90a6c58d59b96a6af8f66a162a4a42854e0a 100644
--- a/hpvm/projects/hpvm-tensor-rt/tests/unit_tests.cc
+++ b/hpvm/projects/hpvm-tensor-rt/tests/tests.h
@@ -1,4 +1,5 @@
 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -460,17 +461,9 @@ void testSampling_1_1(UnitTestResults &unitTestResults) {
 
 
 
-int main() {
-
-  llvm_hpvm_initTensorRt(0);
-
-  UnitTestResults unitTestResults;
+void testSampling(UnitTestResults &unitTestResults){
 
   testSampling_3_3(unitTestResults);
   testSampling_1_1(unitTestResults);
-  testPerforation(unitTestResults);
-  unitTestResults.printSummary();
-
-
-  return 0;
 }
+