COMPMID-417: Use a common create_tensor function

Change-Id: I6b0511484a5b433ebec3fd62d778e64dcb4f89b5
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79362
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
diff --git a/tests/benchmark/NEON/BitwiseAnd.cpp b/tests/benchmark/NEON/BitwiseAnd.cpp
index dba3d1e..be68fd3 100644
--- a/tests/benchmark/NEON/BitwiseAnd.cpp
+++ b/tests/benchmark/NEON/BitwiseAnd.cpp
@@ -22,7 +22,6 @@
  * SOFTWARE.
  */
 #include "Globals.h"
-#include "NEON/Helper.h"
 #include "NEON/NEAccessor.h"
 #include "TensorLibrary.h"
 #include "benchmark/Datasets.h"
@@ -56,11 +55,12 @@
         profiler.add(std::make_shared<WallClockTimer>());
 
         const std::string image_name = *(DataSet().begin() + state.range(0));
+        const RawTensor &raw        = library->get(image_name);
 
         // Create tensors
-        src1 = create_tensor(image_name, DataType::U8);
-        src2 = create_tensor(image_name, DataType::U8);
-        dst  = create_tensor(image_name, DataType::U8);
+        src1 = create_tensor<Tensor>(raw.shape(), DataType::U8);
+        src2 = create_tensor<Tensor>(raw.shape(), DataType::U8);
+        dst  = create_tensor<Tensor>(raw.shape(), DataType::U8);
 
         // Create and configure function
         band.configure(&src1, &src2, &dst);