diff --git a/tests/AssetsLibrary.cpp b/tests/AssetsLibrary.cpp
index d7c881d..529a2a2 100644
--- a/tests/AssetsLibrary.cpp
+++ b/tests/AssetsLibrary.cpp
@@ -23,8 +23,8 @@
  */
 #include "tests/AssetsLibrary.h"
 
-#include "TypePrinter.h"
 #include "Utils.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/ITensor.h"
 
diff --git a/tests/TypePrinter.h b/tests/TypePrinter.h
deleted file mode 100644
index d3d9f8f..0000000
--- a/tests/TypePrinter.h
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * Copyright (c) 2017 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef __ARM_COMPUTE_TEST_TYPE_PRINTER_H__
-#define __ARM_COMPUTE_TEST_TYPE_PRINTER_H__
-
-#include "arm_compute/core/Dimensions.h"
-#include "arm_compute/core/Error.h"
-#include "arm_compute/core/Types.h"
-
-#include <ostream>
-#include <sstream>
-#include <string>
-
-namespace arm_compute
-{
-/** Formatted output of the Dimensions type. */
-template <typename T>
-inline ::std::ostream &operator<<(::std::ostream &os, const Dimensions<T> &dimensions)
-{
-    if(dimensions.num_dimensions() > 0)
-    {
-        os << dimensions[0];
-
-        for(unsigned int d = 1; d < dimensions.num_dimensions(); ++d)
-        {
-            os << "x" << dimensions[d];
-        }
-    }
-
-    return os;
-}
-
-//FIXME: Check why this doesn't work and the TensorShape overload is needed
-template <typename T>
-inline std::string to_string(const Dimensions<T> &dimensions)
-{
-    std::stringstream str;
-    str << dimensions;
-    return str.str();
-}
-
-inline std::string to_string(const TensorShape &shape)
-{
-    std::stringstream str;
-    str << shape;
-    return str.str();
-}
-
-/** Formatted output of the Rectangle type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const Rectangle &rect)
-{
-    os << rect.width << "x" << rect.height;
-    os << "+" << rect.x << "+" << rect.y;
-
-    return os;
-}
-
-/** Formatted output of the PadStridInfo type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const PadStrideInfo &pad_stride_info)
-{
-    os << pad_stride_info.stride().first << "," << pad_stride_info.stride().second;
-    os << ";";
-    os << pad_stride_info.pad().first << "," << pad_stride_info.pad().second;
-
-    return os;
-}
-
-inline std::string to_string(const PadStrideInfo &pad_stride_info)
-{
-    std::stringstream str;
-    str << pad_stride_info;
-    return str.str();
-}
-
-/** Formatted output of the ROIPoolingInfo type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const ROIPoolingLayerInfo &pool_info)
-{
-    os << pool_info.pooled_width() << "x" << pool_info.pooled_height() << "~" << pool_info.spatial_scale();
-    return os;
-}
-
-/** Formatted output of the BorderMode type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const BorderMode &mode)
-{
-    switch(mode)
-    {
-        case BorderMode::UNDEFINED:
-            os << "UNDEFINED";
-            break;
-        case BorderMode::CONSTANT:
-            os << "CONSTANT";
-            break;
-        case BorderMode::REPLICATE:
-            os << "REPLICATE";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const BorderMode &mode)
-{
-    std::stringstream str;
-    str << mode;
-    return str.str();
-}
-
-/** Formatted output of the NonLinearFilterFunction type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const NonLinearFilterFunction &function)
-{
-    switch(function)
-    {
-        case NonLinearFilterFunction::MAX:
-            os << "MAX";
-            break;
-        case NonLinearFilterFunction::MEDIAN:
-            os << "MEDIAN";
-            break;
-        case NonLinearFilterFunction::MIN:
-            os << "MIN";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const NonLinearFilterFunction &function)
-{
-    std::stringstream str;
-    str << function;
-    return str.str();
-}
-
-/** Formatted output of the MatrixPattern type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const MatrixPattern &pattern)
-{
-    switch(pattern)
-    {
-        case MatrixPattern::BOX:
-            os << "BOX";
-            break;
-        case MatrixPattern::CROSS:
-            os << "CROSS";
-            break;
-        case MatrixPattern::DISK:
-            os << "DISK";
-            break;
-        case MatrixPattern::OTHER:
-            os << "OTHER";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const MatrixPattern &pattern)
-{
-    std::stringstream str;
-    str << pattern;
-    return str.str();
-}
-
-/** Formatted output of the InterpolationPolicy type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const InterpolationPolicy &policy)
-{
-    switch(policy)
-    {
-        case InterpolationPolicy::NEAREST_NEIGHBOR:
-            os << "NEAREST_NEIGHBOR";
-            break;
-        case InterpolationPolicy::BILINEAR:
-            os << "BILINEAR";
-            break;
-        case InterpolationPolicy::AREA:
-            os << "AREA";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const InterpolationPolicy &policy)
-{
-    std::stringstream str;
-    str << policy;
-    return str.str();
-}
-
-/** Formatted output of the ConversionPolicy type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const ConvertPolicy &policy)
-{
-    switch(policy)
-    {
-        case ConvertPolicy::WRAP:
-            os << "WRAP";
-            break;
-        case ConvertPolicy::SATURATE:
-            os << "SATURATE";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const ConvertPolicy &policy)
-{
-    std::stringstream str;
-    str << policy;
-    return str.str();
-}
-
-/** Formatted output of the Reduction Operations. */
-inline ::std::ostream &operator<<(::std::ostream &os, const ReductionOperation &op)
-{
-    switch(op)
-    {
-        case ReductionOperation::SUM_SQUARE:
-            os << "SUM_SQUARE";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const ReductionOperation &op)
-{
-    std::stringstream str;
-    str << op;
-    return str.str();
-}
-
-/** Formatted output of the activation function type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const ActivationLayerInfo::ActivationFunction &act_function)
-{
-    switch(act_function)
-    {
-        case ActivationLayerInfo::ActivationFunction::ABS:
-            os << "ABS";
-            break;
-        case ActivationLayerInfo::ActivationFunction::LINEAR:
-            os << "LINEAR";
-            break;
-        case ActivationLayerInfo::ActivationFunction::LOGISTIC:
-            os << "LOGISTIC";
-            break;
-        case ActivationLayerInfo::ActivationFunction::RELU:
-            os << "RELU";
-            break;
-        case ActivationLayerInfo::ActivationFunction::BOUNDED_RELU:
-            os << "BOUNDED_RELU";
-            break;
-        case ActivationLayerInfo::ActivationFunction::LU_BOUNDED_RELU:
-            os << "LU_BOUNDED_RELU";
-            break;
-        case ActivationLayerInfo::ActivationFunction::LEAKY_RELU:
-            os << "LEAKY_RELU";
-            break;
-        case ActivationLayerInfo::ActivationFunction::SOFT_RELU:
-            os << "SOFT_RELU";
-            break;
-        case ActivationLayerInfo::ActivationFunction::SQRT:
-            os << "SQRT";
-            break;
-        case ActivationLayerInfo::ActivationFunction::SQUARE:
-            os << "SQUARE";
-            break;
-        case ActivationLayerInfo::ActivationFunction::TANH:
-            os << "TANH";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const ActivationLayerInfo::ActivationFunction &function)
-{
-    std::stringstream str;
-    str << function;
-    return str.str();
-}
-
-inline std::string to_string(const ActivationLayerInfo &info)
-{
-    std::stringstream str;
-    str << info.activation();
-    return str.str();
-}
-
-/** Formatted output of the NormType type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const NormType &norm_type)
-{
-    switch(norm_type)
-    {
-        case NormType::CROSS_MAP:
-            os << "CROSS_MAP";
-            break;
-        case NormType::IN_MAP_1D:
-            os << "IN_MAP_1D";
-            break;
-        case NormType::IN_MAP_2D:
-            os << "IN_MAP_2D";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const NormType &type)
-{
-    std::stringstream str;
-    str << type;
-    return str.str();
-}
-
-inline std::string to_string(const NormalizationLayerInfo &info)
-{
-    std::stringstream str;
-    str << info.type();
-    return str.str();
-}
-
-/** Formatted output of the PoolingType type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const PoolingType &pool_type)
-{
-    switch(pool_type)
-    {
-        case PoolingType::AVG:
-            os << "AVG";
-            break;
-        case PoolingType::MAX:
-            os << "MAX";
-            break;
-        case PoolingType::L2:
-            os << "L2";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const PoolingType &type)
-{
-    std::stringstream str;
-    str << type;
-    return str.str();
-}
-
-/** Formatted output of @ref PoolingLayerInfo. */
-inline ::std::ostream &operator<<(::std::ostream &os, const PoolingLayerInfo &info)
-{
-    os << info.pool_type() << ";" << info.pool_size() << ";" << info.pad_stride_info();
-
-    return os;
-}
-
-inline std::string to_string(const PoolingLayerInfo &info)
-{
-    std::stringstream str;
-    str << info.pool_type();
-    return str.str();
-}
-
-/** Formatted output of the RoundingPolicy type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const RoundingPolicy &rounding_policy)
-{
-    switch(rounding_policy)
-    {
-        case RoundingPolicy::TO_ZERO:
-            os << "TO_ZERO";
-            break;
-        case RoundingPolicy::TO_NEAREST_UP:
-            os << "TO_NEAREST_UP";
-            break;
-        case RoundingPolicy::TO_NEAREST_EVEN:
-            os << "TO_NEAREST_EVEN";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-/** Formatted output of the DataType type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const DataType &data_type)
-{
-    switch(data_type)
-    {
-        case DataType::UNKNOWN:
-            os << "UNKNOWN";
-            break;
-        case DataType::U8:
-            os << "U8";
-            break;
-        case DataType::QS8:
-            os << "QS8";
-            break;
-        case DataType::S8:
-            os << "S8";
-            break;
-        case DataType::U16:
-            os << "U16";
-            break;
-        case DataType::S16:
-            os << "S16";
-            break;
-        case DataType::QS16:
-            os << "QS16";
-            break;
-        case DataType::U32:
-            os << "U32";
-            break;
-        case DataType::S32:
-            os << "S32";
-            break;
-        case DataType::U64:
-            os << "U64";
-            break;
-        case DataType::S64:
-            os << "S64";
-            break;
-        case DataType::F16:
-            os << "F16";
-            break;
-        case DataType::F32:
-            os << "F32";
-            break;
-        case DataType::F64:
-            os << "F64";
-            break;
-        case DataType::SIZET:
-            os << "SIZET";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-inline std::string to_string(const DataType &data_type)
-{
-    std::stringstream str;
-    str << data_type;
-    return str.str();
-}
-
-/** Formatted output of the Format type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const Format &format)
-{
-    switch(format)
-    {
-        case Format::UNKNOWN:
-            os << "UNKNOWN";
-            break;
-        case Format::U8:
-            os << "U8";
-            break;
-        case Format::S16:
-            os << "S16";
-            break;
-        case Format::U16:
-            os << "U16";
-            break;
-        case Format::S32:
-            os << "S32";
-            break;
-        case Format::U32:
-            os << "U32";
-            break;
-        case Format::F16:
-            os << "F16";
-            break;
-        case Format::F32:
-            os << "F32";
-            break;
-        case Format::UV88:
-            os << "UV88";
-            break;
-        case Format::RGB888:
-            os << "RGB888";
-            break;
-        case Format::RGBA8888:
-            os << "RGBA8888";
-            break;
-        case Format::YUV444:
-            os << "YUV444";
-            break;
-        case Format::YUYV422:
-            os << "YUYV422";
-            break;
-        case Format::NV12:
-            os << "NV12";
-            break;
-        case Format::NV21:
-            os << "NV21";
-            break;
-        case Format::IYUV:
-            os << "IYUV";
-            break;
-        case Format::UYVY422:
-            os << "UYVY422";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-/** Formatted output of the Channel type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const Channel &channel)
-{
-    switch(channel)
-    {
-        case Channel::UNKNOWN:
-            os << "UNKNOWN";
-            break;
-        case Channel::C0:
-            os << "C0";
-            break;
-        case Channel::C1:
-            os << "C1";
-            break;
-        case Channel::C2:
-            os << "C2";
-            break;
-        case Channel::C3:
-            os << "C3";
-            break;
-        case Channel::R:
-            os << "R";
-            break;
-        case Channel::G:
-            os << "G";
-            break;
-        case Channel::B:
-            os << "B";
-            break;
-        case Channel::A:
-            os << "A";
-            break;
-        case Channel::Y:
-            os << "Y";
-            break;
-        case Channel::U:
-            os << "U";
-            break;
-        case Channel::V:
-            os << "V";
-            break;
-        default:
-            ARM_COMPUTE_ERROR("NOT_SUPPORTED!");
-    }
-
-    return os;
-}
-
-/** Formatted output of the BorderSize type. */
-inline ::std::ostream &operator<<(::std::ostream &os, const BorderSize &border)
-{
-    os << border.top << ","
-       << border.right << ","
-       << border.bottom << ","
-       << border.left;
-
-    return os;
-}
-} // namespace arm_compute
-#endif /* __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ */
diff --git a/tests/benchmark/CL/ActivationLayer.cpp b/tests/benchmark/CL/ActivationLayer.cpp
index 50a2004..e919c78 100644
--- a/tests/benchmark/CL/ActivationLayer.cpp
+++ b/tests/benchmark/CL/ActivationLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLActivationLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ActivationLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h"
@@ -38,6 +37,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/BatchNormalizationLayer.cpp b/tests/benchmark/CL/BatchNormalizationLayer.cpp
index b0e36d3..af88278 100644
--- a/tests/benchmark/CL/BatchNormalizationLayer.cpp
+++ b/tests/benchmark/CL/BatchNormalizationLayer.cpp
@@ -27,12 +27,12 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLBatchNormalizationLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/BatchNormalizationLayerFixture.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h"
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/ConvolutionLayer.cpp b/tests/benchmark/CL/ConvolutionLayer.cpp
index 620feaf..4467765 100644
--- a/tests/benchmark/CL/ConvolutionLayer.cpp
+++ b/tests/benchmark/CL/ConvolutionLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h"
@@ -38,6 +37,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/DepthwiseConvolution.cpp b/tests/benchmark/CL/DepthwiseConvolution.cpp
index a8c229f..40412da 100644
--- a/tests/benchmark/CL/DepthwiseConvolution.cpp
+++ b/tests/benchmark/CL/DepthwiseConvolution.cpp
@@ -27,11 +27,11 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLDepthwiseConvolution.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/DepthwiseConvolutionFixture.h"
 #include "tests/datasets/MobileNetDepthwiseConvolutionDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp b/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp
index 0c4fbb1..7f5bb00 100644
--- a/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp
+++ b/tests/benchmark/CL/DepthwiseSeparableConvolutionLayer.cpp
@@ -27,11 +27,11 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLDepthwiseSeparableConvolutionLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/DepthwiseSeparableConvolutionLayerFixture.h"
 #include "tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/DirectConvolutionLayer.cpp b/tests/benchmark/CL/DirectConvolutionLayer.cpp
index 15bf808..2430a4e 100644
--- a/tests/benchmark/CL/DirectConvolutionLayer.cpp
+++ b/tests/benchmark/CL/DirectConvolutionLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h"
@@ -37,6 +36,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/Floor.cpp b/tests/benchmark/CL/Floor.cpp
index ce8fa48..b2ada0e 100644
--- a/tests/benchmark/CL/Floor.cpp
+++ b/tests/benchmark/CL/Floor.cpp
@@ -27,11 +27,11 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLFloor.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/FloorFixture.h"
 #include "tests/datasets/ShapeDatasets.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/FullyConnectedLayer.cpp b/tests/benchmark/CL/FullyConnectedLayer.cpp
index d41424a..e5f3217 100644
--- a/tests/benchmark/CL/FullyConnectedLayer.cpp
+++ b/tests/benchmark/CL/FullyConnectedLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/FullyConnectedLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h"
@@ -36,6 +35,7 @@
 #include "tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/GEMM.cpp b/tests/benchmark/CL/GEMM.cpp
index 3febef5..ece2043 100644
--- a/tests/benchmark/CL/GEMM.cpp
+++ b/tests/benchmark/CL/GEMM.cpp
@@ -26,12 +26,12 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLGEMM.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/GEMMFixture.h"
 #include "tests/datasets/MatrixMultiplyGEMMDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/NormalizationLayer.cpp b/tests/benchmark/CL/NormalizationLayer.cpp
index 2035ae3..8dd5f62 100644
--- a/tests/benchmark/CL/NormalizationLayer.cpp
+++ b/tests/benchmark/CL/NormalizationLayer.cpp
@@ -27,12 +27,12 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLNormalizationLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/NormalizationLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/PoolingLayer.cpp b/tests/benchmark/CL/PoolingLayer.cpp
index fcc37e9..116639a 100644
--- a/tests/benchmark/CL/PoolingLayer.cpp
+++ b/tests/benchmark/CL/PoolingLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/PoolingLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h"
@@ -38,6 +37,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/ROIPoolingLayer.cpp b/tests/benchmark/CL/ROIPoolingLayer.cpp
index a10134f..4e78673 100644
--- a/tests/benchmark/CL/ROIPoolingLayer.cpp
+++ b/tests/benchmark/CL/ROIPoolingLayer.cpp
@@ -29,11 +29,11 @@
 #include "arm_compute/runtime/CL/functions/CLROIPoolingLayer.h"
 #include "tests/CL/CLAccessor.h"
 #include "tests/CL/CLArrayAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ROIPoolingLayerFixture.h"
 #include "tests/datasets/ROIPoolingLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/SYSTEM/AlexNet.cpp b/tests/benchmark/CL/SYSTEM/AlexNet.cpp
index fcf8a52..5f25841 100644
--- a/tests/benchmark/CL/SYSTEM/AlexNet.cpp
+++ b/tests/benchmark/CL/SYSTEM/AlexNet.cpp
@@ -34,10 +34,10 @@
 #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h"
 #include "arm_compute/runtime/CL/functions/CLSoftmaxLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/AlexNetFixture.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/CL/SYSTEM/LeNet5.cpp b/tests/benchmark/CL/SYSTEM/LeNet5.cpp
index 35ebc7d..21e5432 100644
--- a/tests/benchmark/CL/SYSTEM/LeNet5.cpp
+++ b/tests/benchmark/CL/SYSTEM/LeNet5.cpp
@@ -31,10 +31,10 @@
 #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h"
 #include "arm_compute/runtime/CL/functions/CLSoftmaxLayer.h"
 #include "tests/CL/CLAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/LeNet5Fixture.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/ActivationLayer.cpp b/tests/benchmark/NEON/ActivationLayer.cpp
index 0b699f2..a00e7ec 100644
--- a/tests/benchmark/NEON/ActivationLayer.cpp
+++ b/tests/benchmark/NEON/ActivationLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ActivationLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h"
@@ -38,6 +37,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/BatchNormalizationLayer.cpp b/tests/benchmark/NEON/BatchNormalizationLayer.cpp
index 1b0d484..5bfd234 100644
--- a/tests/benchmark/NEON/BatchNormalizationLayer.cpp
+++ b/tests/benchmark/NEON/BatchNormalizationLayer.cpp
@@ -27,9 +27,9 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 #include "tests/benchmark/fixtures/BatchNormalizationLayerFixture.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h"
diff --git a/tests/benchmark/NEON/ConvolutionLayer.cpp b/tests/benchmark/NEON/ConvolutionLayer.cpp
index 6d2857d..effcf63 100644
--- a/tests/benchmark/NEON/ConvolutionLayer.cpp
+++ b/tests/benchmark/NEON/ConvolutionLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h"
@@ -38,6 +37,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/DirectConvolutionLayer.cpp b/tests/benchmark/NEON/DirectConvolutionLayer.cpp
index a9dd4b9..e25a072 100644
--- a/tests/benchmark/NEON/DirectConvolutionLayer.cpp
+++ b/tests/benchmark/NEON/DirectConvolutionLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h"
 #include "tests/datasets/DirectConvolutionLayerDataset.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h"
@@ -38,6 +37,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/Floor.cpp b/tests/benchmark/NEON/Floor.cpp
index 4bc0c05..824aee9 100644
--- a/tests/benchmark/NEON/Floor.cpp
+++ b/tests/benchmark/NEON/Floor.cpp
@@ -27,11 +27,11 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/FloorFixture.h"
 #include "tests/datasets/ShapeDatasets.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/FullyConnectedLayer.cpp b/tests/benchmark/NEON/FullyConnectedLayer.cpp
index 88499b1..c12d7ce 100644
--- a/tests/benchmark/NEON/FullyConnectedLayer.cpp
+++ b/tests/benchmark/NEON/FullyConnectedLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/FullyConnectedLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h"
@@ -36,6 +35,7 @@
 #include "tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/GEMM.cpp b/tests/benchmark/NEON/GEMM.cpp
index 2c5a726..ddc54e6 100644
--- a/tests/benchmark/NEON/GEMM.cpp
+++ b/tests/benchmark/NEON/GEMM.cpp
@@ -27,12 +27,12 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/GEMMFixture.h"
 #include "tests/datasets/MatrixMultiplyGEMMDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/NormalizationLayer.cpp b/tests/benchmark/NEON/NormalizationLayer.cpp
index 0488795..383cec9 100644
--- a/tests/benchmark/NEON/NormalizationLayer.cpp
+++ b/tests/benchmark/NEON/NormalizationLayer.cpp
@@ -27,12 +27,12 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/NormalizationLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/PoolingLayer.cpp b/tests/benchmark/NEON/PoolingLayer.cpp
index 05a173b..8d4e0a0 100644
--- a/tests/benchmark/NEON/PoolingLayer.cpp
+++ b/tests/benchmark/NEON/PoolingLayer.cpp
@@ -27,7 +27,6 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/PoolingLayerFixture.h"
 #include "tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h"
 #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h"
@@ -38,6 +37,7 @@
 #include "tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/ROIPoolingLayer.cpp b/tests/benchmark/NEON/ROIPoolingLayer.cpp
index d3a7e4b..64b3570 100644
--- a/tests/benchmark/NEON/ROIPoolingLayer.cpp
+++ b/tests/benchmark/NEON/ROIPoolingLayer.cpp
@@ -29,11 +29,11 @@
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
 #include "tests/NEON/ArrayAccessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/ROIPoolingLayerFixture.h"
 #include "tests/datasets/ROIPoolingLayerDataset.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp
index cd48e5d..19598e3 100644
--- a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp
+++ b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp
@@ -34,10 +34,10 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/AlexNetFixture.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp
index 46ccfc0..5075da5 100644
--- a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp
+++ b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp
@@ -31,10 +31,10 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "arm_compute/runtime/TensorAllocator.h"
 #include "tests/NEON/Accessor.h"
-#include "tests/TypePrinter.h"
 #include "tests/benchmark/fixtures/LeNet5Fixture.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/datasets/BatchNormalizationLayerDataset.h b/tests/datasets/BatchNormalizationLayerDataset.h
index 25e65d9..fceff1e 100644
--- a/tests/datasets/BatchNormalizationLayerDataset.h
+++ b/tests/datasets/BatchNormalizationLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_BATCHNORMALIZATION_LAYER_DATASET
 #define ARM_COMPUTE_TEST_BATCHNORMALIZATION_LAYER_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/BorderModeDataset.h b/tests/datasets/BorderModeDataset.h
index df024a7..3b8a08c 100644
--- a/tests/datasets/BorderModeDataset.h
+++ b/tests/datasets/BorderModeDataset.h
@@ -27,6 +27,13 @@
 #include "arm_compute/core/Types.h"
 #include "tests/framework/datasets/ContainerDataset.h"
 
+#include "utils/TypePrinter.h"
+
+#include "arm_compute/core/TensorShape.h"
+#include "arm_compute/core/Types.h"
+
+#include "arm_compute/core/TensorShape.h"
+#include "arm_compute/core/Types.h"
 #include <vector>
 
 namespace arm_compute
diff --git a/tests/datasets/ConvolutionLayerDataset.h b/tests/datasets/ConvolutionLayerDataset.h
index ba11bd5..6e2d2a1 100644
--- a/tests/datasets/ConvolutionLayerDataset.h
+++ b/tests/datasets/ConvolutionLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_CONVOLUTION_LAYER_DATASET
 #define ARM_COMPUTE_TEST_CONVOLUTION_LAYER_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/DepthwiseConvolutionDataset.h b/tests/datasets/DepthwiseConvolutionDataset.h
index bdc9495..6a7af63 100644
--- a/tests/datasets/DepthwiseConvolutionDataset.h
+++ b/tests/datasets/DepthwiseConvolutionDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_DEPTHWISE_CONVOLUTION_DATASET
 #define ARM_COMPUTE_TEST_DEPTHWISE_CONVOLUTION_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h b/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h
index 4391379..6b39d3a 100644
--- a/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h
+++ b/tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_DEPTHWISE_SEPARABLE_CONVOLUTION_LAYER_DATASET
 #define ARM_COMPUTE_TEST_DEPTHWISE_SEPARABLE_CONVOLUTION_LAYER_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/DirectConvolutionLayerDataset.h b/tests/datasets/DirectConvolutionLayerDataset.h
index dca38b5..294f44f 100644
--- a/tests/datasets/DirectConvolutionLayerDataset.h
+++ b/tests/datasets/DirectConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/FullyConnectedLayerDataset.h b/tests/datasets/FullyConnectedLayerDataset.h
index 8401e39..5789954 100644
--- a/tests/datasets/FullyConnectedLayerDataset.h
+++ b/tests/datasets/FullyConnectedLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_FULLYCONNECTED_LAYER_DATASET
 #define ARM_COMPUTE_TEST_FULLYCONNECTED_LAYER_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/GEMMDataset.h b/tests/datasets/GEMMDataset.h
index bb8a328..9491582 100644
--- a/tests/datasets/GEMMDataset.h
+++ b/tests/datasets/GEMMDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_GEMM_DATASET
 #define ARM_COMPUTE_TEST_GEMM_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 
diff --git a/tests/datasets/LargeConvolutionLayerDataset.h b/tests/datasets/LargeConvolutionLayerDataset.h
index 721530a..086b2e3 100644
--- a/tests/datasets/LargeConvolutionLayerDataset.h
+++ b/tests/datasets/LargeConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/LargeGEMMDataset.h b/tests/datasets/LargeGEMMDataset.h
index 37cdfaa..638eb90 100644
--- a/tests/datasets/LargeGEMMDataset.h
+++ b/tests/datasets/LargeGEMMDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/GEMMDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/MatrixMultiplyGEMMDataset.h b/tests/datasets/MatrixMultiplyGEMMDataset.h
index 771403b..718c32b 100644
--- a/tests/datasets/MatrixMultiplyGEMMDataset.h
+++ b/tests/datasets/MatrixMultiplyGEMMDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/GEMMDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 
diff --git a/tests/datasets/MatrixPatternDataset.h b/tests/datasets/MatrixPatternDataset.h
index 4c14149..423aeb8 100644
--- a/tests/datasets/MatrixPatternDataset.h
+++ b/tests/datasets/MatrixPatternDataset.h
@@ -27,6 +27,13 @@
 #include "arm_compute/core/Types.h"
 #include "tests/framework/datasets/ContainerDataset.h"
 
+#include "utils/TypePrinter.h"
+
+#include "arm_compute/core/TensorShape.h"
+#include "arm_compute/core/Types.h"
+
+#include "arm_compute/core/TensorShape.h"
+#include "arm_compute/core/Types.h"
 #include <vector>
 
 namespace arm_compute
diff --git a/tests/datasets/MobileNetDepthwiseConvolutionDataset.h b/tests/datasets/MobileNetDepthwiseConvolutionDataset.h
index c417f18..c9d98d4 100644
--- a/tests/datasets/MobileNetDepthwiseConvolutionDataset.h
+++ b/tests/datasets/MobileNetDepthwiseConvolutionDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/DepthwiseConvolutionDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h b/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h
index c7784c3..f6137ee 100644
--- a/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h
+++ b/tests/datasets/MobileNetDepthwiseSeparableConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/DepthwiseSeparableConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/PoolingLayerDataset.h b/tests/datasets/PoolingLayerDataset.h
index e5e9cd7..56ec3b8 100644
--- a/tests/datasets/PoolingLayerDataset.h
+++ b/tests/datasets/PoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 namespace arm_compute
 {
diff --git a/tests/datasets/ROIPoolingLayerDataset.h b/tests/datasets/ROIPoolingLayerDataset.h
index 65d589e..a1879d3 100644
--- a/tests/datasets/ROIPoolingLayerDataset.h
+++ b/tests/datasets/ROIPoolingLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_ROI_POOLING_LAYER_DATASET
 #define ARM_COMPUTE_TEST_ROI_POOLING_LAYER_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/RandomBatchNormalizationLayerDataset.h b/tests/datasets/RandomBatchNormalizationLayerDataset.h
index f4c61e0..1090887 100644
--- a/tests/datasets/RandomBatchNormalizationLayerDataset.h
+++ b/tests/datasets/RandomBatchNormalizationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/BatchNormalizationLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/ReductionOperationDataset.h b/tests/datasets/ReductionOperationDataset.h
index ce1bcb8..e710588 100644
--- a/tests/datasets/ReductionOperationDataset.h
+++ b/tests/datasets/ReductionOperationDataset.h
@@ -25,8 +25,8 @@
 #define __ARM_COMPUTE_TEST_REDUCTION_OPERATION_DATASET_H__
 
 #include "arm_compute/core/Types.h"
-#include "tests/TypePrinter.h"
 #include "tests/framework/datasets/ContainerDataset.h"
+#include "utils/TypePrinter.h"
 
 #include <vector>
 
diff --git a/tests/datasets/ReshapeLayerDataset.h b/tests/datasets/ReshapeLayerDataset.h
index db7b0b3..fa938a6 100644
--- a/tests/datasets/ReshapeLayerDataset.h
+++ b/tests/datasets/ReshapeLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef ARM_COMPUTE_TEST_RESHAPE_LAYER_DATASET
 #define ARM_COMPUTE_TEST_RESHAPE_LAYER_DATASET
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 
diff --git a/tests/datasets/SmallConvolutionLayerDataset.h b/tests/datasets/SmallConvolutionLayerDataset.h
index 1a26fa5..8eda2e8 100644
--- a/tests/datasets/SmallConvolutionLayerDataset.h
+++ b/tests/datasets/SmallConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/SmallGEMMDataset.h b/tests/datasets/SmallGEMMDataset.h
index 0cc3c3a..5d59c1d 100644
--- a/tests/datasets/SmallGEMMDataset.h
+++ b/tests/datasets/SmallGEMMDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/GEMMDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h
index 4030e97..74c5fda 100644
--- a/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h
+++ b/tests/datasets/system_tests/alexnet/AlexNetActivationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h
index d0b901a..dcf96c7 100644
--- a/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h
+++ b/tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h
index 50b0f7d..3d43e6f 100644
--- a/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h
+++ b/tests/datasets/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/FullyConnectedLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h
index 33b7423..6f68fd7 100644
--- a/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h
+++ b/tests/datasets/system_tests/alexnet/AlexNetNormalizationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h b/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h
index ab2749b..739d24c 100644
--- a/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h
+++ b/tests/datasets/system_tests/alexnet/AlexNetPoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/PoolingLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h
index dc4ffe4..76087fa 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h
index a4002d1..1415ff1 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h
index 80a3473..cde9ae6 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/FullyConnectedLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h
index 806ca93..3b5c9ac 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/GEMMDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 
diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h
index d8fd061..eb6903f 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h
index 6164bba..b775667 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/PoolingLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h
index 2d58639..395b1f9 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h
index d96410f..3a22c78 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4BatchNormalizationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/BatchNormalizationLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h
index a050d3d..3dd8a7c 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h
index 8cf59e8..5a0af2b 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4FullyConnectedLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/FullyConnectedLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h
index 3b1ee8d..a58fd79 100644
--- a/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h
+++ b/tests/datasets/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4PoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/PoolingLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h
index 4c88cde..021bfee 100644
--- a/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h
+++ b/tests/datasets/system_tests/lenet5/LeNet5ActivationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h
index e1d3ead..3f28627 100644
--- a/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h
+++ b/tests/datasets/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h
index 343ecc0..74e8d2c 100644
--- a/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h
+++ b/tests/datasets/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/FullyConnectedLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h b/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h
index bc2de7b..bcd11dc 100644
--- a/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h
+++ b/tests/datasets/system_tests/lenet5/LeNet5PoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/PoolingLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h b/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h
index 7644387..7f4bf4d 100644
--- a/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h
+++ b/tests/datasets/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h b/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h
index 2d447b0..2bb9db7 100644
--- a/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h
+++ b/tests/datasets/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h b/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h
index 69d04db..cb2edbc 100644
--- a/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h
+++ b/tests/datasets/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/PoolingLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h
index 66301dd..93de996 100644
--- a/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h
+++ b/tests/datasets/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h
index 36cb5d9..fe31da2 100644
--- a/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h
+++ b/tests/datasets/system_tests/vgg/vgg16/VGG16ConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h
index d34dc3f..3b40b34 100644
--- a/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h
+++ b/tests/datasets/system_tests/vgg/vgg16/VGG16FullyConnectedLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/FullyConnectedLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h b/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h
index 4db2087..affbcc5 100644
--- a/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h
+++ b/tests/datasets/system_tests/vgg/vgg16/VGG16PoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/PoolingLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h
index 8a2cd16..f30069e 100644
--- a/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h
+++ b/tests/datasets/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/framework/datasets/Datasets.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h
index cc6a6dc..4d2cba8 100644
--- a/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h
+++ b/tests/datasets/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/BatchNormalizationLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h
index 41f48b0..b4cb357 100644
--- a/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h
+++ b/tests/datasets/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/ConvolutionLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h b/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h
index 3763d63..62222f3 100644
--- a/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h
+++ b/tests/datasets/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h
@@ -26,7 +26,7 @@
 
 #include "tests/datasets/PoolingLayerDataset.h"
 
-#include "tests/TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation/Validation.h b/tests/validation/Validation.h
index 7d4ce57..38cbada 100644
--- a/tests/validation/Validation.h
+++ b/tests/validation/Validation.h
@@ -28,10 +28,10 @@
 #include "arm_compute/core/Types.h"
 #include "tests/IAccessor.h"
 #include "tests/SimpleTensor.h"
-#include "tests/TypePrinter.h"
 #include "tests/Utils.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Exceptions.h"
+#include "utils/TypePrinter.h"
 
 #include <iomanip>
 #include <ios>
diff --git a/tests/validation_old/AssetsLibrary.cpp b/tests/validation_old/AssetsLibrary.cpp
index fa8569e..997af27 100644
--- a/tests/validation_old/AssetsLibrary.cpp
+++ b/tests/validation_old/AssetsLibrary.cpp
@@ -24,8 +24,8 @@
 #include "tests/AssetsLibrary.h"
 
 #include "arm_compute/core/ITensor.h"
-#include "tests/TypePrinter.h"
 #include "tests/Utils.h"
+#include "utils/TypePrinter.h"
 
 #include <cctype>
 #include <fstream>
diff --git a/tests/validation_old/CL/FillBorder.cpp b/tests/validation_old/CL/FillBorder.cpp
index ed47a1e..deb40a1 100644
--- a/tests/validation_old/CL/FillBorder.cpp
+++ b/tests/validation_old/CL/FillBorder.cpp
@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 #include "CL/CLAccessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/CL/kernels/CLFillBorderKernel.h"
 #include "arm_compute/core/Helpers.h"
diff --git a/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp b/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp
index 3721fb5..4f7764c 100644
--- a/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp
+++ b/tests/validation_old/CL/FixedPoint/FixedPoint_QS8.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "CL/CLAccessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/CL/CLKernelLibrary.h"
 #include "arm_compute/core/CL/ICLKernel.h"
diff --git a/tests/validation_old/CL/Gaussian3x3.cpp b/tests/validation_old/CL/Gaussian3x3.cpp
index 27f4833..6aa2d03 100644
--- a/tests/validation_old/CL/Gaussian3x3.cpp
+++ b/tests/validation_old/CL/Gaussian3x3.cpp
@@ -23,7 +23,6 @@
  */
 #include "CL/CLAccessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/Gaussian5x5.cpp b/tests/validation_old/CL/Gaussian5x5.cpp
index c187426..32a33d2 100644
--- a/tests/validation_old/CL/Gaussian5x5.cpp
+++ b/tests/validation_old/CL/Gaussian5x5.cpp
@@ -23,7 +23,6 @@
  */
 #include "CL/CLAccessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/HarrisCorners.cpp b/tests/validation_old/CL/HarrisCorners.cpp
index 2c73679..ff39918 100644
--- a/tests/validation_old/CL/HarrisCorners.cpp
+++ b/tests/validation_old/CL/HarrisCorners.cpp
@@ -22,7 +22,6 @@
  * SOFTWARE.
  */
 #include "CL/CLAccessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -30,6 +29,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/IntegralImage.cpp b/tests/validation_old/CL/IntegralImage.cpp
index ea15b90..7db2b68 100644
--- a/tests/validation_old/CL/IntegralImage.cpp
+++ b/tests/validation_old/CL/IntegralImage.cpp
@@ -24,13 +24,13 @@
 
 #include "CL/CLAccessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/MinMaxLocation.cpp b/tests/validation_old/CL/MinMaxLocation.cpp
index 8824215..06e9388 100644
--- a/tests/validation_old/CL/MinMaxLocation.cpp
+++ b/tests/validation_old/CL/MinMaxLocation.cpp
@@ -23,13 +23,13 @@
  */
 
 #include "CL/CLAccessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/PixelWiseMultiplication.cpp b/tests/validation_old/CL/PixelWiseMultiplication.cpp
index f003298..5bc7182 100644
--- a/tests/validation_old/CL/PixelWiseMultiplication.cpp
+++ b/tests/validation_old/CL/PixelWiseMultiplication.cpp
@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 #include "CL/CLAccessor.h"
-#include "TypePrinter.h"
 #include "tests/Globals.h"
 #include "tests/Utils.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/runtime/CL/functions/CLPixelWiseMultiplication.h"
 
diff --git a/tests/validation_old/CL/ROIPoolingLayer.cpp b/tests/validation_old/CL/ROIPoolingLayer.cpp
index edd1ccc..ec804cc 100644
--- a/tests/validation_old/CL/ROIPoolingLayer.cpp
+++ b/tests/validation_old/CL/ROIPoolingLayer.cpp
@@ -23,7 +23,6 @@
  */
 #include "CL/CLAccessor.h"
 #include "CL/CLArrayAccessor.h"
-#include "TypePrinter.h"
 #include "arm_compute/runtime/CL/CLArray.h"
 #include "arm_compute/runtime/CL/functions/CLROIPoolingLayer.h"
 #include "tests/Globals.h"
@@ -32,6 +31,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include <random>
 #include <vector>
diff --git a/tests/validation_old/CL/Sobel3x3.cpp b/tests/validation_old/CL/Sobel3x3.cpp
index a4c779c..cb4e318 100644
--- a/tests/validation_old/CL/Sobel3x3.cpp
+++ b/tests/validation_old/CL/Sobel3x3.cpp
@@ -24,7 +24,6 @@
 
 #include "CL/CLAccessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -32,6 +31,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/Sobel5x5.cpp b/tests/validation_old/CL/Sobel5x5.cpp
index 7e5dec1..d035027 100644
--- a/tests/validation_old/CL/Sobel5x5.cpp
+++ b/tests/validation_old/CL/Sobel5x5.cpp
@@ -24,7 +24,6 @@
 
 #include "CL/CLAccessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -32,6 +31,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/Threshold.cpp b/tests/validation_old/CL/Threshold.cpp
index 74ddd68..1857907 100644
--- a/tests/validation_old/CL/Threshold.cpp
+++ b/tests/validation_old/CL/Threshold.cpp
@@ -23,7 +23,6 @@
  */
 #include "CL/CLAccessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/dataset/ThresholdDataset.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/CL/WarpPerspective.cpp b/tests/validation_old/CL/WarpPerspective.cpp
index 6252361..3d3da7a 100644
--- a/tests/validation_old/CL/WarpPerspective.cpp
+++ b/tests/validation_old/CL/WarpPerspective.cpp
@@ -23,7 +23,6 @@
  */
 #include "CL/CLAccessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -32,6 +31,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/AbsoluteDifference.cpp b/tests/validation_old/NEON/AbsoluteDifference.cpp
index aa866ff..cde0b46 100644
--- a/tests/validation_old/NEON/AbsoluteDifference.cpp
+++ b/tests/validation_old/NEON/AbsoluteDifference.cpp
@@ -23,13 +23,13 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/Accumulate.cpp b/tests/validation_old/NEON/Accumulate.cpp
index eb680a3..a173338 100644
--- a/tests/validation_old/NEON/Accumulate.cpp
+++ b/tests/validation_old/NEON/Accumulate.cpp
@@ -23,13 +23,13 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/AccumulateSquared.cpp b/tests/validation_old/NEON/AccumulateSquared.cpp
index 29b5edf..f4eea7d 100644
--- a/tests/validation_old/NEON/AccumulateSquared.cpp
+++ b/tests/validation_old/NEON/AccumulateSquared.cpp
@@ -23,13 +23,13 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/AccumulateWeighted.cpp b/tests/validation_old/NEON/AccumulateWeighted.cpp
index c59c1ed..758e437 100644
--- a/tests/validation_old/NEON/AccumulateWeighted.cpp
+++ b/tests/validation_old/NEON/AccumulateWeighted.cpp
@@ -23,13 +23,13 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/FillBorder.cpp b/tests/validation_old/NEON/FillBorder.cpp
index 277bbf2..cbf637e 100644
--- a/tests/validation_old/NEON/FillBorder.cpp
+++ b/tests/validation_old/NEON/FillBorder.cpp
@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp
index 6611587..a0e785e 100644
--- a/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Exp_QS16.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp
index 9e8096f..dbae116 100644
--- a/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Exp_QS8.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp
index f56707a..1d06e07 100644
--- a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS16.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp
index fb33fd4..ea21b8f 100644
--- a/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Invsqrt_QS8.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp
index 6485b20..d85112a 100644
--- a/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Log_QS16.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp
index 21012c5..41b2856 100644
--- a/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Log_QS8.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp
index 5630a33..9605595 100644
--- a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS16.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp
index 23f98ac..7a1c5b7 100644
--- a/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp
+++ b/tests/validation_old/NEON/Fixedpoint/Reciprocal_QS8.cpp
@@ -22,13 +22,13 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/ReferenceCPP.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/NEON/NEFixedPoint.h"
diff --git a/tests/validation_old/NEON/Gaussian3x3.cpp b/tests/validation_old/NEON/Gaussian3x3.cpp
index becd919..b1fdc5e 100644
--- a/tests/validation_old/NEON/Gaussian3x3.cpp
+++ b/tests/validation_old/NEON/Gaussian3x3.cpp
@@ -23,7 +23,6 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/Gaussian5x5.cpp b/tests/validation_old/NEON/Gaussian5x5.cpp
index 240285a..c98d21b 100644
--- a/tests/validation_old/NEON/Gaussian5x5.cpp
+++ b/tests/validation_old/NEON/Gaussian5x5.cpp
@@ -23,7 +23,6 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/HarrisCorners.cpp b/tests/validation_old/NEON/HarrisCorners.cpp
index 809e61c..172be87 100644
--- a/tests/validation_old/NEON/HarrisCorners.cpp
+++ b/tests/validation_old/NEON/HarrisCorners.cpp
@@ -23,7 +23,6 @@
  */
 #include "NEON/Accessor.h"
 #include "NEON/Helper.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/IntegralImage.cpp b/tests/validation_old/NEON/IntegralImage.cpp
index 69654b2..f42393a 100644
--- a/tests/validation_old/NEON/IntegralImage.cpp
+++ b/tests/validation_old/NEON/IntegralImage.cpp
@@ -24,13 +24,13 @@
 
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/MinMaxLocation.cpp b/tests/validation_old/NEON/MinMaxLocation.cpp
index c41745a..1b258d1 100644
--- a/tests/validation_old/NEON/MinMaxLocation.cpp
+++ b/tests/validation_old/NEON/MinMaxLocation.cpp
@@ -25,13 +25,13 @@
 #include "NEON/Accessor.h"
 #include "NEON/Helper.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/PixelWiseMultiplication.cpp b/tests/validation_old/NEON/PixelWiseMultiplication.cpp
index 60eb82e..f352fc4 100644
--- a/tests/validation_old/NEON/PixelWiseMultiplication.cpp
+++ b/tests/validation_old/NEON/PixelWiseMultiplication.cpp
@@ -23,13 +23,13 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
 #include "tests/validation_old/Datasets.h"
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/ROIPoolingLayer.cpp b/tests/validation_old/NEON/ROIPoolingLayer.cpp
index 2046beb..a8d5637 100644
--- a/tests/validation_old/NEON/ROIPoolingLayer.cpp
+++ b/tests/validation_old/NEON/ROIPoolingLayer.cpp
@@ -23,7 +23,6 @@
  */
 #include "NEON/Accessor.h"
 #include "NEON/ArrayAccessor.h"
-#include "TypePrinter.h"
 #include "arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h"
 #include "tests/Globals.h"
 #include "tests/Utils.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include <random>
 #include <vector>
diff --git a/tests/validation_old/NEON/Sobel3x3.cpp b/tests/validation_old/NEON/Sobel3x3.cpp
index cb249e1..3023640 100644
--- a/tests/validation_old/NEON/Sobel3x3.cpp
+++ b/tests/validation_old/NEON/Sobel3x3.cpp
@@ -22,7 +22,6 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -30,6 +29,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/Sobel5x5.cpp b/tests/validation_old/NEON/Sobel5x5.cpp
index 2f26e62..e9835b6 100644
--- a/tests/validation_old/NEON/Sobel5x5.cpp
+++ b/tests/validation_old/NEON/Sobel5x5.cpp
@@ -24,7 +24,6 @@
 
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -32,6 +31,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/Threshold.cpp b/tests/validation_old/NEON/Threshold.cpp
index d56ec5e..6f42f19 100644
--- a/tests/validation_old/NEON/Threshold.cpp
+++ b/tests/validation_old/NEON/Threshold.cpp
@@ -23,7 +23,6 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -31,6 +30,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/dataset/ThresholdDataset.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/NEON/WarpPerspective.cpp b/tests/validation_old/NEON/WarpPerspective.cpp
index 5a15591..97bda1e 100644
--- a/tests/validation_old/NEON/WarpPerspective.cpp
+++ b/tests/validation_old/NEON/WarpPerspective.cpp
@@ -23,7 +23,6 @@
  */
 #include "NEON/Accessor.h"
 #include "PaddingCalculator.h"
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "tests/AssetsLibrary.h"
 #include "tests/Globals.h"
@@ -32,6 +31,7 @@
 #include "tests/validation_old/Reference.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/Helpers.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/ProgramOptions.cpp b/tests/validation_old/ProgramOptions.cpp
index 08375b3..96320e8 100644
--- a/tests/validation_old/ProgramOptions.cpp
+++ b/tests/validation_old/ProgramOptions.cpp
@@ -24,8 +24,8 @@
 #include "ProgramOptions.h"
 
 #include "arm_compute/core/Types.h"
-#include "tests/TypePrinter.h"
 #include "tests/TypeReader.h"
+#include "utils/TypePrinter.h"
 
 #include <random>
 #include <sstream>
diff --git a/tests/validation_old/ReferenceCPP.cpp b/tests/validation_old/ReferenceCPP.cpp
index eae892a..cca8997 100644
--- a/tests/validation_old/ReferenceCPP.cpp
+++ b/tests/validation_old/ReferenceCPP.cpp
@@ -26,13 +26,13 @@
 #include "TensorFactory.h"
 #include "TensorOperations.h"
 #include "TensorVisitors.h"
-#include "TypePrinter.h"
 
 #include "arm_compute/core/Coordinates.h"
 #include "arm_compute/core/Error.h"
 #include "arm_compute/core/TensorInfo.h"
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/runtime/Tensor.h"
+#include "utils/TypePrinter.h"
 
 #include "tests/validation_old/boost_wrapper.h"
 
diff --git a/tests/validation_old/UNIT/FixedPoint.cpp b/tests/validation_old/UNIT/FixedPoint.cpp
index 53fef97..6a92cfb 100644
--- a/tests/validation_old/UNIT/FixedPoint.cpp
+++ b/tests/validation_old/UNIT/FixedPoint.cpp
@@ -23,11 +23,11 @@
  */
 #include "tests/validation_old/FixedPoint.h"
 
-#include "TypePrinter.h"
 #include "Utils.h"
 #include "support/ToolchainSupport.h"
 #include "tests/validation_old/Validation.h"
 #include "tests/validation_old/ValidationUserConfiguration.h"
+#include "utils/TypePrinter.h"
 
 #include "tests/validation_old/boost_wrapper.h"
 
diff --git a/tests/validation_old/UNIT/TensorInfo.cpp b/tests/validation_old/UNIT/TensorInfo.cpp
index 488378a..ec1db42 100644
--- a/tests/validation_old/UNIT/TensorInfo.cpp
+++ b/tests/validation_old/UNIT/TensorInfo.cpp
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "TypePrinter.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorInfo.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/UNIT/TensorShape.cpp b/tests/validation_old/UNIT/TensorShape.cpp
index dc75b93..3505b1a 100644
--- a/tests/validation_old/UNIT/TensorShape.cpp
+++ b/tests/validation_old/UNIT/TensorShape.cpp
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "TypePrinter.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 
diff --git a/tests/validation_old/UNIT/Utils.cpp b/tests/validation_old/UNIT/Utils.cpp
index b302bf2..a32fe18 100644
--- a/tests/validation_old/UNIT/Utils.cpp
+++ b/tests/validation_old/UNIT/Utils.cpp
@@ -23,8 +23,8 @@
  */
 #include "Utils.h"
 
-#include "TypePrinter.h"
 #include "tests/validation_old/Validation.h"
+#include "utils/TypePrinter.h"
 
 #include "tests/validation_old/boost_wrapper.h"
 
diff --git a/tests/validation_old/Validation.cpp b/tests/validation_old/Validation.cpp
index 8f173ba..da5e874 100644
--- a/tests/validation_old/Validation.cpp
+++ b/tests/validation_old/Validation.cpp
@@ -31,9 +31,9 @@
 #include "arm_compute/runtime/Tensor.h"
 #include "tests/IAccessor.h"
 #include "tests/RawTensor.h"
-#include "tests/TypePrinter.h"
 #include "tests/Utils.h"
 #include "tests/validation_old/half.h"
+#include "utils/TypePrinter.h"
 
 #include <array>
 #include <cmath>
diff --git a/tests/validation_old/dataset/ActivationLayerDataset.h b/tests/validation_old/dataset/ActivationLayerDataset.h
index ead52a2..881e19f 100644
--- a/tests/validation_old/dataset/ActivationLayerDataset.h
+++ b/tests/validation_old/dataset/ActivationLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_ACTIVATION_LAYER_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_ACTIVATION_LAYER_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/dataset/BatchNormalizationLayerDataset.h b/tests/validation_old/dataset/BatchNormalizationLayerDataset.h
index ca1e3b6..3ad1bef 100644
--- a/tests/validation_old/dataset/BatchNormalizationLayerDataset.h
+++ b/tests/validation_old/dataset/BatchNormalizationLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_BATCH_NORMALIZATION_LAYER_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_BATCH_NORMALIZATION_LAYER_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/dataset/ConvolutionLayerDataset.h b/tests/validation_old/dataset/ConvolutionLayerDataset.h
index 4fcba8d..e612c3e 100644
--- a/tests/validation_old/dataset/ConvolutionLayerDataset.h
+++ b/tests/validation_old/dataset/ConvolutionLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_CONVOLUTION_LAYER_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_CONVOLUTION_LAYER_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "tests/validation_old/dataset/GenericDataset.h"
diff --git a/tests/validation_old/dataset/FullyConnectedLayerDataset.h b/tests/validation_old/dataset/FullyConnectedLayerDataset.h
index 3564560..8a8fed8 100644
--- a/tests/validation_old/dataset/FullyConnectedLayerDataset.h
+++ b/tests/validation_old/dataset/FullyConnectedLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_FULLY_CONNECTED_LAYER_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_FULLY_CONNECTED_LAYER_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "tests/validation_old/dataset/GenericDataset.h"
diff --git a/tests/validation_old/dataset/GEMMDataset.h b/tests/validation_old/dataset/GEMMDataset.h
index 5250827..ee2a387 100644
--- a/tests/validation_old/dataset/GEMMDataset.h
+++ b/tests/validation_old/dataset/GEMMDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_GEMM_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_GEMM_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/dataset/NormalizationLayerDataset.h b/tests/validation_old/dataset/NormalizationLayerDataset.h
index cd3c14d..489d1e0 100644
--- a/tests/validation_old/dataset/NormalizationLayerDataset.h
+++ b/tests/validation_old/dataset/NormalizationLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_NORMALIZATION_LAYER_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_NORMALIZATION_LAYER_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/dataset/PoolingLayerDataset.h b/tests/validation_old/dataset/PoolingLayerDataset.h
index 6895ae4..a4e570c 100644
--- a/tests/validation_old/dataset/PoolingLayerDataset.h
+++ b/tests/validation_old/dataset/PoolingLayerDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_POOLING_LAYER_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_POOLING_LAYER_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"
diff --git a/tests/validation_old/dataset/ThresholdDataset.h b/tests/validation_old/dataset/ThresholdDataset.h
index 74d0b9c..789ffac 100644
--- a/tests/validation_old/dataset/ThresholdDataset.h
+++ b/tests/validation_old/dataset/ThresholdDataset.h
@@ -24,7 +24,7 @@
 #ifndef __ARM_COMPUTE_TEST_DATASET_THRESHOLD_DATASET_H__
 #define __ARM_COMPUTE_TEST_DATASET_THRESHOLD_DATASET_H__
 
-#include "TypePrinter.h"
+#include "utils/TypePrinter.h"
 
 #include "arm_compute/core/TensorShape.h"
 #include "arm_compute/core/Types.h"