diff --git a/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp b/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
index 63614e9f5859775cbd3e180d7dc09e7ce2604ccc..87af9d55fe4cd72783b9e9f7ac847c736bf34328 100644
--- a/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(DiscLayerConstruction) {
   auto pTransform = std::make_shared<const Transform3D>(translation);
   const double minRad(5.), maxRad(10.);  // 20 x 10 disc
   auto pDisc = std::make_shared<const RadialBounds>(minRad, maxRad);
-  auto pDiscLayer = DiscLayer::create(pTransform, pDisc);
+  auto pDiscLayer = DiscLayer::create(pTransform, pDisc, nullptr, 1.);
   BOOST_CHECK_EQUAL(pDiscLayer->layerType(), LayerType::passive);
   // next level: need an array of Surfaces;
   // bounds object, rectangle type
@@ -57,7 +57,8 @@ BOOST_AUTO_TEST_CASE(DiscLayerConstruction) {
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds),
       Surface::makeShared<PlaneSurface>(pNullTransform, rBounds)};
   const double thickness(1.0);
-  auto pDiscLayerFromSurfaces = DiscLayer::create(pTransform, pDisc, nullptr);
+  auto pDiscLayerFromSurfaces =
+      DiscLayer::create(pTransform, pDisc, nullptr, 1.);
   BOOST_CHECK_EQUAL(pDiscLayerFromSurfaces->layerType(), LayerType::passive);
   // construct with thickness:
   auto pDiscLayerWithThickness =
@@ -83,7 +84,7 @@ BOOST_AUTO_TEST_CASE(DiscLayerProperties /*, *utf::expected_failures(1)*/) {
   auto pTransform = std::make_shared<const Transform3D>(translation);
   const double minRad(5.), maxRad(10.);  // 20 x 10 disc
   auto pDisc = std::make_shared<const RadialBounds>(minRad, maxRad);
-  auto pDiscLayer = DiscLayer::create(pTransform, pDisc);
+  auto pDiscLayer = DiscLayer::create(pTransform, pDisc, nullptr, 1.);
   // auto planeSurface = pDiscLayer->surfaceRepresentation();
   BOOST_CHECK_EQUAL(pDiscLayer->surfaceRepresentation().name(),
                     std::string("Acts::DiscSurface"));
diff --git a/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
index bad8f0658d6db8e83b3a98ff2ae0a46a5df9e6e3..e19714c0e72dae3f94c3068c45044de17dc2e40f 100644
--- a/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
@@ -134,7 +134,8 @@ BOOST_AUTO_TEST_CASE(DiamondBoundsAssignment) {
                     similarlyConstructeDiamondBoundsObject);
   //
   /// Test assignment
-  DiamondBounds assignedDiamondBoundsObject(0, 0, 0, 0, 0);  // invalid
+  DiamondBounds assignedDiamondBoundsObject(
+      2 * minHalfX, 2 * midHalfX, 2 * maxHalfX, 2 * halfY1, 2 * halfY2);
   // object, in some sense
   assignedDiamondBoundsObject = diamondBoundsObject;
   BOOST_CHECK_EQUAL(assignedDiamondBoundsObject, diamondBoundsObject);