diff --git a/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp b/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp
index f135e23303..584652d5c5 100644
--- a/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp
+++ b/tests/src/Mod/Part/App/TopoShapeMakeShapeWithElementMap.cpp
@@ -7,7 +7,7 @@
 #include "src/App/InitApplication.h"
 #include "TopoShapeExpansionHelpers.h"
 #include <Mod/Part/App/TopoShape.h>
-
+// #include <MappedName.h>
 #include <TopoDS_Vertex.hxx>
 
 class TopoShapeMakeShapeWithElementMapTests: public ::testing::Test
@@ -48,6 +48,7 @@ private:
     Part::TopoShape::Mapper _mapper;
 };
 
+
 TEST_F(TopoShapeMakeShapeWithElementMapTests, nullShapeThrows)
 {
     // Arrange
@@ -59,3 +60,47 @@ TEST_F(TopoShapeMakeShapeWithElementMapTests, nullShapeThrows)
     EXPECT_THROW(Shape()->makeShapeWithElementMap(nullShape, *Mapper(), sources),
                  Part::NullShapeException);
 }
+
+using Data::IndexedName, Data::MappedName;
+using Part::TopoShape;
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapVertex)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapEdge)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapWire)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapFace)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapShell)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapSolid)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapCompound)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapCompSolid)
+// TEST_F(TopoShapeMakeShapeWithElementMapTests, mapOffsetCubes)
+TEST_F(TopoShapeMakeShapeWithElementMapTests, mapIntersectingCubes)
+{
+    // Arrange
+    auto [cube1, cube2] = TopoShapeExpansionHelpers::CreateTwoCubes();
+    auto transform {gp_Trsf()};
+    transform.SetTranslation(gp_Vec(gp_XYZ(-0.5, -0.5, 0)));
+    cube2.Move(TopLoc_Location(transform));
+    std::vector<TopoShape> sources {cube1, cube2};
+    sources[0].Tag = 1;
+    sources[1].Tag = 2;
+    // sources[0].makeShapeWithElementMap(sources[0].getShape(), *Mapper(), {sources[0]});
+    // sources[1].makeShapeWithElementMap(sources[1].getShape(), *Mapper(), {sources[1]});
+
+    TopoShape compound;
+    compound.makeElementCompound(sources);
+    // Act
+    compound.makeShapeWithElementMap(compound.getShape(), *Mapper(), sources);
+    auto elements = compound.getElementMap();
+    std::map<IndexedName, MappedName> mapped;
+    for (auto name : elements) {
+        mapped.emplace(name.index, name.name);
+    }
+    // Assert
+    EXPECT_EQ(elements.size(), 52);
+    EXPECT_EQ(mapped[IndexedName("Edge1")], MappedName("Edge1;MAK;:H1:4,E"));
+    EXPECT_EQ(mapped[IndexedName("Edge", 13)], MappedName("Edge1;MAK;:H2:4,E"));
+    // EXPECT_STREQ(mapped[IndexedName("Edge1")],MappedName("Edge1;MAK;:H:4,E;MAK;:H1:f,E"));
+    // EXPECT_STREQ(mapped[IndexedName("Edge",13)],MappedName("Edge1;MAK;:H:4,E;MAK;:H2:f,E"));
+    EXPECT_STREQ(sources[0].shapeName().c_str(), "Solid");
+    EXPECT_STREQ(sources[1].shapeName().c_str(), "Solid");
+    EXPECT_STREQ(compound.shapeName().c_str(), "Compound");
+}