diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
index 42f8756f7f0feae838caa652406017c9389a21c4..2bb5fa23355a44902cbb24b8f6cce5d016b63188 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet2_cifar10/alexnet2_cifar10.cpp
@@ -415,7 +415,7 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/alexnet2_cifar10/";
 
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 32, 3, 3, 3);
@@ -497,7 +497,7 @@ int main() {
   int test_input_size = 5000;
   int batch_count = test_input_size / batch_size;
 
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
   // void* input = create4DTensor(0,nchw,batch_size,3,32,32);
 
   startMemTracking();
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
index e5edc8a5890cdbf51bba1ed0effdf64b2297d29a..ae5f31b7dcca3ec59920e0dcc0ba34ca5ea28cbc 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_cifar10/alexnet_cifar10.cpp
@@ -366,9 +366,9 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/alexnet_cifar10/";
 
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
   // void* input = readTrainedWeights(input_path.c_str(), 0,5000,3,32,32);
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   uint8_t *labels = readLabels(labels_path.c_str(), 5000);
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
index 24f4d1520a0fe42b20149baac6d0ca3c4c8d6ba0..500199589bb79a093372515ef29dd2768f3abce1 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/alexnet_imagenet/alexnet_imagenet.cpp
@@ -465,8 +465,8 @@ int main() {
   std::string dir_prefix =
       std::string(MODEL_PARAMS_DIR) + "/alexnet_imagenet/";
 
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 11, 11);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
index a20315cb9c36610aac2d0d43059182302674b83b..b67d585d01b4809d4107d95ab4476e741f13dd7c 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/lenet_mnist/lenet_mnist.cpp
@@ -268,8 +268,8 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/lenet_mnist/";
 
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
 
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
index 5ea5c298bf7b5858af024aff7a4ee81c4b8a6ed2..a4de2826216d9bf6b3843e466097abae35ca8b72 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/mobilenet_cifar10/mobilenet_cifar10.cpp
@@ -1968,8 +1968,8 @@ typedef struct __attribute__((__packed__)) {
 int main() {
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/mobilenet_cifar10/";
 
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 32, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
index c6fa02c784f90f8c03a81991763e533d864b9ed0..66ab37cd33e502df35f73ca2b3addb1c4be53808 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet18_cifar10/resnet18_cifar10.cpp
@@ -1303,9 +1303,9 @@ typedef struct __attribute__((__packed__)) {
 int main() {
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/resnet18_cifar10/";
 
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
   // void* input = readTrainedWeights(input_path.c_str(), 0,5000,3,32,32);
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   // uint32_t* labels = readLabels3(labels_path.c_str(),5000);
 
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
index b41e0bc96df83a91f5656e7094e914e8d86e6df5..db6b64daa0d214017ebcf968067fe44f40aa9c06 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/resnet50_imagenet/resnet50_imagenet.cpp
@@ -5136,8 +5136,8 @@ int main() {
 
   std::string dir_prefix =
       std::string(MODEL_PARAMS_DIR) + "/resnet50_imagenet/";
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 7, 7);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
index 13d150e7a946296e8ce5c7fb9e128a91dedbe534..39c2ffc8769c8b8f13b359e56f4e138dff0fed98 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar10/vgg16_cifar10.cpp
@@ -830,8 +830,8 @@ typedef struct __attribute__((__packed__)) {
 int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar10/";
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
index 6e26f89b755db90853ce90180ab179b6df421827..ce899cd0a24776bd5a7c8b51f13e0dac698b3495 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_cifar100/vgg16_cifar100.cpp
@@ -831,8 +831,8 @@ int main() {
 
   std::string dir_prefix = std::string(MODEL_PARAMS_DIR) + "/vgg16_cifar100/";
 
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);
@@ -998,7 +998,7 @@ int main() {
   startMemTracking();
   startProfiling();
 
-  for (int j = 0; j < 14; j++) {
+  for (int j = 0; j < 1; j++) {
     for (int i = 0; i < batch_count; i++) {
 
       int start = i * batch_size;
diff --git a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
index 4fad931efc4988cebdf317dc0761c9146cebab0f..91af01fe8eb7deacb47cc42f3fe6cbb620adc000 100644
--- a/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
+++ b/hpvm/test/dnn_benchmarks/benchmarks/vgg16_imagenet/vgg16_imagenet.cpp
@@ -879,8 +879,8 @@ int main() {
 
   std::string dir_prefix =
       std::string(MODEL_PARAMS_DIR) + "/vgg16_imagenet/";
-  std::string input_path = dir_prefix + std::string("tune_input.bin");
-  std::string labels_path = dir_prefix + std::string("tune_labels.bin");
+  std::string input_path = dir_prefix + std::string("test_input.bin");
+  std::string labels_path = dir_prefix + std::string("test_labels.bin");
   std::string conv2d_1_w_path = dir_prefix + std::string("conv2d_1_w.bin");
   void *conv2d_1_w =
       readTrainedWeights(conv2d_1_w_path.c_str(), 0, 64, 3, 3, 3);