diff --git a/unit_tests/operator/Test_ExpandImpl.cpp b/unit_tests/operator/Test_ExpandImpl.cpp
index 98661080dc5a0cfdfa4a8400fa8e20de879bdda7..557faa53f5e739677e3848a1368f07c4c1ae1564 100644
--- a/unit_tests/operator/Test_ExpandImpl.cpp
+++ b/unit_tests/operator/Test_ExpandImpl.cpp
@@ -20,19 +20,17 @@
 #include <memory>
 
 #include "aidge/data/Tensor.hpp"
-#include "aidge/filler/Filler.hpp"
 #include "aidge/operator/Expand.hpp"
 
-#include "aidge/backend/cpu.hpp"
 
-using std::shared_ptr;
+namespace Aidge {
 
-using namespace Aidge;
+using std::shared_ptr;
 
 static void setupTestExpand(shared_ptr<Tensor> inputData,
-                     shared_ptr<Tensor> inputShape,
-                     shared_ptr<OperatorTensor> &op,
-                     shared_ptr<Tensor> &expectedOutput) {
+                            shared_ptr<Tensor> inputShape,
+                            shared_ptr<OperatorTensor> &op,
+                            shared_ptr<Tensor> &expectedOutput) {
 
     op->getOutput(0)->setDataType(inputData->dataType());
 
@@ -111,3 +109,4 @@ TEST_CASE("[cpu/operator] Expand(forward)", "[Expand][CPU]") {
     SECTION("N-Dim to N-Dim") {}
     auto inputData = std::shared_ptr<Tensor>();
 }
+} // namespace Aidge