diff --git a/Tests/Core/Geometry/ConeLayerTests.cpp b/Tests/Core/Geometry/ConeLayerTests.cpp
index 3a2b589c721c6609e5f34e373df4fac61b1e159d..59ad0812038955be08c7df1cb38a84f361337db5 100644
--- a/Tests/Core/Geometry/ConeLayerTests.cpp
+++ b/Tests/Core/Geometry/ConeLayerTests.cpp
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(ConeLayerConstruction) {
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(1., 1.);
   /// Constructor with transform pointer
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   const std::vector<std::shared_ptr<const Surface>> aSurfaces{
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds),
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds)};
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(ConeLayerProperties /*, *utf::expected_failures(1)*/) {
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(1., 1.);
   /// Constructor with transform pointer
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   auto pCone = std::make_shared<const ConeBounds>(alpha, symmetric);
   const std::vector<std::shared_ptr<const Surface>> aSurfaces{
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds),
diff --git a/Tests/Core/Geometry/CylinderLayerTests.cpp b/Tests/Core/Geometry/CylinderLayerTests.cpp
index 2dc297399f881802c53cac90f3c4a9880334a82f..20fcd20585d0f4e740d20138b4d4054f5558b759 100644
--- a/Tests/Core/Geometry/CylinderLayerTests.cpp
+++ b/Tests/Core/Geometry/CylinderLayerTests.cpp
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(CylinderLayerConstruction) {
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(1., 1.);
   /// Constructor with transform pointer
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   const std::vector<std::shared_ptr<const Surface>> aSurfaces{
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds),
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds)};
diff --git a/Tests/Core/Geometry/DiscLayerTests.cpp b/Tests/Core/Geometry/DiscLayerTests.cpp
index 339c3fcc27fb6152a3927159fd3074d1ca783112..6f2afc3900977844b0869680a04091bd6381920b 100644
--- a/Tests/Core/Geometry/DiscLayerTests.cpp
+++ b/Tests/Core/Geometry/DiscLayerTests.cpp
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(DiscLayerConstruction) {
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(1., 1.);
   /// Constructor with transform pointer
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   const std::vector<std::shared_ptr<const Surface>> aSurfaces{
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds),
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds)};
diff --git a/Tests/Core/Geometry/LayerTests.cpp b/Tests/Core/Geometry/LayerTests.cpp
index 8e70ca753b39b898d92424e3f466e417d4b7584a..7aadf0d376d3b32ff6d5fd3abb0cad29bd3b9fee 100644
--- a/Tests/Core/Geometry/LayerTests.cpp
+++ b/Tests/Core/Geometry/LayerTests.cpp
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(LayerProperties, *utf::expected_failures(1)) {
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(1., 1.);
   /// Constructor with transform pointer
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   const std::vector<std::shared_ptr<const Surface>> aSurfaces{
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds),
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds)};
diff --git a/Tests/Core/Geometry/PlaneLayerTests.cpp b/Tests/Core/Geometry/PlaneLayerTests.cpp
index 1d1bb49cc3ae509c4a904164c10ed3424c489d4a..009f8897274da472c6074592c7054cd777aaa6ee 100644
--- a/Tests/Core/Geometry/PlaneLayerTests.cpp
+++ b/Tests/Core/Geometry/PlaneLayerTests.cpp
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(PlaneLayerConstruction) {
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(1., 1.);
   /// Constructor with transform pointer
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   const std::vector<std::shared_ptr<const Surface>> aSurfaces{
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds),
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds)};
diff --git a/Tests/Core/Surfaces/ConeSurfaceTests.cpp b/Tests/Core/Surfaces/ConeSurfaceTests.cpp
index 885b9c02f5cf5017b6365e30dff5a4c8be52ac23..35c684f42c466e594dbfbc014d4edc8afc6cc0d1 100644
--- a/Tests/Core/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/ConeSurfaceTests.cpp
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceConstruction) {
   bool symmetric(false);
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   BOOST_CHECK_EQUAL(
       Surface::makeShared<ConeSurface>(pNullTransform, alpha, symmetric)
           ->type(),
@@ -94,7 +94,6 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceProperties) {
   bool symmetric(false);
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  // auto pNullTransform = std::make_shared<const Transform3D>();
   auto coneSurfaceObject =
       Surface::makeShared<ConeSurface>(pTransform, alpha, symmetric);
   //
diff --git a/Tests/Core/Surfaces/CylinderSurfaceTests.cpp b/Tests/Core/Surfaces/CylinderSurfaceTests.cpp
index de28ad012e1414f98189501e527f2eeea2bc404d..1e959af9a52cd30809214f4deace050eca15cbc7 100644
--- a/Tests/Core/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/CylinderSurfaceTests.cpp
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceConstruction) {
   double radius(1.0), halfZ(10.), halfPhiSector(M_PI / 8.);
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   BOOST_CHECK_EQUAL(
       Surface::makeShared<CylinderSurface>(pNullTransform, radius, halfZ)
           ->type(),
@@ -90,7 +90,6 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceProperties) {
   double radius(1.0), halfZ(10.);
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  // auto pNullTransform = std::make_shared<const Transform3D>();
   auto cylinderSurfaceObject =
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ);
   //
diff --git a/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp b/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp
index 0a4e3fa664f64e2df1c025a3db582cfa03acf766..927b5925b5d05b4d6687e54068602ebbc41e24d4 100644
--- a/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(PerigeeSurfaceConstruction) {
   /// Constructor with transform pointer, null or valid
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   BOOST_CHECK_EQUAL(Surface::makeShared<PerigeeSurface>(pNullTransform)->type(),
                     Surface::Perigee);
   BOOST_CHECK_EQUAL(Surface::makeShared<PerigeeSurface>(pTransform)->type(),
diff --git a/Tests/Core/Surfaces/PlaneSurfaceTests.cpp b/Tests/Core/Surfaces/PlaneSurfaceTests.cpp
index 748bcf55318f18f3cd667f95e309825fab003874..254fe4a55f3f3448a12fc692d64891354802fc9e 100644
--- a/Tests/Core/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/PlaneSurfaceTests.cpp
@@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceConstruction) {
   /// indicator
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   // constructor with nullptr transform
   BOOST_CHECK_EQUAL(
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds)->type(),
@@ -80,7 +80,6 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceProperties) {
   /// Test clone method
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  // auto pNullTransform = std::make_shared<const Transform3D>();
   auto planeSurfaceObject =
       Surface::makeShared<PlaneSurface>(pTransform, rBounds);
   //
diff --git a/Tests/Core/Surfaces/StrawSurfaceTests.cpp b/Tests/Core/Surfaces/StrawSurfaceTests.cpp
index 44c198852a1054849f7f3da12b5699fe91fd4d1e..1e2e0f6d4313d7d6d28b6263ece3348fd9a96c59 100644
--- a/Tests/Core/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/StrawSurfaceTests.cpp
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(StrawSurfaceConstruction) {
   double radius(1.0), halfZ(10.);
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  auto pNullTransform = std::make_shared<const Transform3D>();
+  std::shared_ptr<const Transform3D> pNullTransform{};
   BOOST_CHECK_EQUAL(
       Surface::makeShared<StrawSurface>(pNullTransform, radius, halfZ)->type(),
       Surface::Straw);
@@ -87,7 +87,6 @@ BOOST_AUTO_TEST_CASE(StrawSurfaceProperties) {
   double radius(1.0), halfZ(10.);
   Translation3D translation{0., 1., 2.};
   auto pTransform = std::make_shared<const Transform3D>(translation);
-  // auto pNullTransform = std::make_shared<const Transform3D>();
   auto strawSurfaceObject =
       Surface::makeShared<StrawSurface>(pTransform, radius, halfZ);
   //