diff --git a/docs/test_cases/t00002_class.png b/docs/test_cases/t00002_class.png
index 1b2e5cc2..a2d1b5fe 100644
Binary files a/docs/test_cases/t00002_class.png and b/docs/test_cases/t00002_class.png differ
diff --git a/docs/test_cases/t00003_class.png b/docs/test_cases/t00003_class.png
index a455d7e9..38013897 100644
Binary files a/docs/test_cases/t00003_class.png and b/docs/test_cases/t00003_class.png differ
diff --git a/docs/test_cases/t00004_class.png b/docs/test_cases/t00004_class.png
index b9a11c54..b3959579 100644
Binary files a/docs/test_cases/t00004_class.png and b/docs/test_cases/t00004_class.png differ
diff --git a/docs/test_cases/t00005_class.png b/docs/test_cases/t00005_class.png
index 86d49b15..a3e20bd9 100644
Binary files a/docs/test_cases/t00005_class.png and b/docs/test_cases/t00005_class.png differ
diff --git a/docs/test_cases/t00006_class.png b/docs/test_cases/t00006_class.png
index 6b052977..2da7c717 100644
Binary files a/docs/test_cases/t00006_class.png and b/docs/test_cases/t00006_class.png differ
diff --git a/docs/test_cases/t00007_class.png b/docs/test_cases/t00007_class.png
index 4a39df2c..28ccdff4 100644
Binary files a/docs/test_cases/t00007_class.png and b/docs/test_cases/t00007_class.png differ
diff --git a/docs/test_cases/t00008_class.png b/docs/test_cases/t00008_class.png
index 8e373923..0cd44f40 100644
Binary files a/docs/test_cases/t00008_class.png and b/docs/test_cases/t00008_class.png differ
diff --git a/docs/test_cases/t00009_class.png b/docs/test_cases/t00009_class.png
index 980ea789..0dab4be7 100644
Binary files a/docs/test_cases/t00009_class.png and b/docs/test_cases/t00009_class.png differ
diff --git a/docs/test_cases/t00010_class.png b/docs/test_cases/t00010_class.png
index 49cb17bd..d6f78220 100644
Binary files a/docs/test_cases/t00010_class.png and b/docs/test_cases/t00010_class.png differ
diff --git a/docs/test_cases/t00011_class.png b/docs/test_cases/t00011_class.png
index 4e951c01..62e35eff 100644
Binary files a/docs/test_cases/t00011_class.png and b/docs/test_cases/t00011_class.png differ
diff --git a/docs/test_cases/t00012_class.png b/docs/test_cases/t00012_class.png
index 5e37aae9..63bc6179 100644
Binary files a/docs/test_cases/t00012_class.png and b/docs/test_cases/t00012_class.png differ
diff --git a/docs/test_cases/t00013_class.png b/docs/test_cases/t00013_class.png
index ed99af2a..fb39642f 100644
Binary files a/docs/test_cases/t00013_class.png and b/docs/test_cases/t00013_class.png differ
diff --git a/docs/test_cases/t00014_class.png b/docs/test_cases/t00014_class.png
index fc130072..0954ed16 100644
Binary files a/docs/test_cases/t00014_class.png and b/docs/test_cases/t00014_class.png differ
diff --git a/docs/test_cases/t00015_class.png b/docs/test_cases/t00015_class.png
index 0ea5904f..1689be22 100644
Binary files a/docs/test_cases/t00015_class.png and b/docs/test_cases/t00015_class.png differ
diff --git a/docs/test_cases/t00016_class.png b/docs/test_cases/t00016_class.png
index a2916a1e..0259e361 100644
Binary files a/docs/test_cases/t00016_class.png and b/docs/test_cases/t00016_class.png differ
diff --git a/docs/test_cases/t00017_class.png b/docs/test_cases/t00017_class.png
index 34a81e12..32d0fa72 100644
Binary files a/docs/test_cases/t00017_class.png and b/docs/test_cases/t00017_class.png differ
diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md
index 760615a8..1b72af09 100644
--- a/docs/test_cases/t00018.md
+++ b/docs/test_cases/t00018.md
@@ -17,6 +17,36 @@ diagrams:
 
 ```
 ## Source code
+File t00018_impl.cc
+```cpp
+#include "t00018_impl.h"
+#include "t00018.h"
+
+namespace clanguml {
+namespace t00018 {
+namespace impl {
+
+widget::widget(int n)
+    : n(n)
+{
+}
+
+void widget::draw(const clanguml::t00018::widget &w) const
+{
+    if (w.shown())
+        std::cout << "drawing a const widget " << n << '\n';
+}
+
+void widget::draw(const clanguml::t00018::widget &w)
+{
+    if (w.shown())
+        std::cout << "drawing a non-const widget " << n << '\n';
+}
+}
+}
+}
+
+```
 File t00018_impl.h
 ```cpp
 #pragma once
@@ -101,36 +131,6 @@ widget &widget::operator=(widget &&) = default;
 }
 }
 
-```
-File t00018_impl.cc
-```cpp
-#include "t00018_impl.h"
-#include "t00018.h"
-
-namespace clanguml {
-namespace t00018 {
-namespace impl {
-
-widget::widget(int n)
-    : n(n)
-{
-}
-
-void widget::draw(const clanguml::t00018::widget &w) const
-{
-    if (w.shown())
-        std::cout << "drawing a const widget " << n << '\n';
-}
-
-void widget::draw(const clanguml::t00018::widget &w)
-{
-    if (w.shown())
-        std::cout << "drawing a non-const widget " << n << '\n';
-}
-}
-}
-}
-
 ```
 ## Generated UML diagrams
 ![t00018_class](./t00018_class.png "Pimpl pattern")
diff --git a/docs/test_cases/t00018_class.png b/docs/test_cases/t00018_class.png
index 9ae9211b..c3e3fa3b 100644
Binary files a/docs/test_cases/t00018_class.png and b/docs/test_cases/t00018_class.png differ
diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md
index 5d835bfc..6a7a8b01 100644
--- a/docs/test_cases/t00019.md
+++ b/docs/test_cases/t00019.md
@@ -22,25 +22,21 @@ diagrams:
 
 ```
 ## Source code
-File t00019_layer2.h
+File t00019.cc
 ```cpp
-#pragma once
+#include "t00019_base.h"
+#include "t00019_layer1.h"
+#include "t00019_layer2.h"
+#include "t00019_layer3.h"
+
+#include <memory>
 
 namespace clanguml {
 namespace t00019 {
 
-template <typename LowerLayer> class Layer2 : public LowerLayer {
-
-    using LowerLayer::LowerLayer;
-
-    using LowerLayer::m1;
-
-    using LowerLayer::m2;
-
-    int all_calls_count() const
-    {
-        return LowerLayer::m1_calls() + LowerLayer::m2_calls();
-    }
+class A {
+public:
+    std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> layers;
 };
 }
 }
@@ -98,26 +94,6 @@ template <typename LowerLayer> class Layer1 : public LowerLayer {
 }
 }
 
-```
-File t00019.cc
-```cpp
-#include "t00019_base.h"
-#include "t00019_layer1.h"
-#include "t00019_layer2.h"
-#include "t00019_layer3.h"
-
-#include <memory>
-
-namespace clanguml {
-namespace t00019 {
-
-class A {
-public:
-    std::unique_ptr<Layer1<Layer2<Layer3<Base>>>> layers;
-};
-}
-}
-
 ```
 File t00019_layer3.h
 ```cpp
@@ -155,6 +131,30 @@ private:
 }
 }
 
+```
+File t00019_layer2.h
+```cpp
+#pragma once
+
+namespace clanguml {
+namespace t00019 {
+
+template <typename LowerLayer> class Layer2 : public LowerLayer {
+
+    using LowerLayer::LowerLayer;
+
+    using LowerLayer::m1;
+
+    using LowerLayer::m2;
+
+    int all_calls_count() const
+    {
+        return LowerLayer::m1_calls() + LowerLayer::m2_calls();
+    }
+};
+}
+}
+
 ```
 ## Generated UML diagrams
 ![t00019_class](./t00019_class.png "Layercake pattern")
diff --git a/docs/test_cases/t00019_class.png b/docs/test_cases/t00019_class.png
index bbf61c87..9ad66bac 100644
Binary files a/docs/test_cases/t00019_class.png and b/docs/test_cases/t00019_class.png differ
diff --git a/docs/test_cases/t00020_class.png b/docs/test_cases/t00020_class.png
index 2c98afcd..c7df1d23 100644
Binary files a/docs/test_cases/t00020_class.png and b/docs/test_cases/t00020_class.png differ
diff --git a/docs/test_cases/t00021_class.png b/docs/test_cases/t00021_class.png
index 0d4664e5..aacdaa00 100644
Binary files a/docs/test_cases/t00021_class.png and b/docs/test_cases/t00021_class.png differ
diff --git a/docs/test_cases/t00022_class.png b/docs/test_cases/t00022_class.png
index 6d9d2c54..6fc33aea 100644
Binary files a/docs/test_cases/t00022_class.png and b/docs/test_cases/t00022_class.png differ
diff --git a/docs/test_cases/t00023_class.png b/docs/test_cases/t00023_class.png
index a24f17a3..a94059a5 100644
Binary files a/docs/test_cases/t00023_class.png and b/docs/test_cases/t00023_class.png differ
diff --git a/docs/test_cases/t00024_class.png b/docs/test_cases/t00024_class.png
index 2713ba67..d21b6826 100644
Binary files a/docs/test_cases/t00024_class.png and b/docs/test_cases/t00024_class.png differ
diff --git a/docs/test_cases/t00025_class.png b/docs/test_cases/t00025_class.png
index 9b76a458..e04810f0 100644
Binary files a/docs/test_cases/t00025_class.png and b/docs/test_cases/t00025_class.png differ
diff --git a/docs/test_cases/t00026_class.png b/docs/test_cases/t00026_class.png
index 1809d486..76da28b8 100644
Binary files a/docs/test_cases/t00026_class.png and b/docs/test_cases/t00026_class.png differ
diff --git a/docs/test_cases/t00027_class.png b/docs/test_cases/t00027_class.png
index 281e0aed..8b18184c 100644
Binary files a/docs/test_cases/t00027_class.png and b/docs/test_cases/t00027_class.png differ
diff --git a/docs/test_cases/t00028_class.png b/docs/test_cases/t00028_class.png
index f27f1d23..36b290d1 100644
Binary files a/docs/test_cases/t00028_class.png and b/docs/test_cases/t00028_class.png differ
diff --git a/docs/test_cases/t00029_class.png b/docs/test_cases/t00029_class.png
index 95586287..ec015724 100644
Binary files a/docs/test_cases/t00029_class.png and b/docs/test_cases/t00029_class.png differ
diff --git a/docs/test_cases/t00030_class.png b/docs/test_cases/t00030_class.png
index ce4b8b67..f76932e7 100644
Binary files a/docs/test_cases/t00030_class.png and b/docs/test_cases/t00030_class.png differ
diff --git a/docs/test_cases/t00031_class.png b/docs/test_cases/t00031_class.png
index 9fe6a879..bc5ca0fb 100644
Binary files a/docs/test_cases/t00031_class.png and b/docs/test_cases/t00031_class.png differ
diff --git a/docs/test_cases/t00032_class.png b/docs/test_cases/t00032_class.png
index cbd72e5c..ff515338 100644
Binary files a/docs/test_cases/t00032_class.png and b/docs/test_cases/t00032_class.png differ
diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md
index 25ef901d..e1c0d073 100644
--- a/docs/test_cases/t00033.md
+++ b/docs/test_cases/t00033.md
@@ -41,7 +41,7 @@ struct D {
 };
 
 struct R {
-    A<B<C<D>>> abc;
+    A<B<std::unique_ptr<C<D>>>> abc;
 };
 
 } // namespace t00033
diff --git a/docs/test_cases/t00033_class.png b/docs/test_cases/t00033_class.png
index 987938ca..ded3a806 100644
Binary files a/docs/test_cases/t00033_class.png and b/docs/test_cases/t00033_class.png differ
diff --git a/docs/test_cases/t20001_sequence.png b/docs/test_cases/t20001_sequence.png
index e972c3f5..99576880 100644
Binary files a/docs/test_cases/t20001_sequence.png and b/docs/test_cases/t20001_sequence.png differ
diff --git a/docs/test_cases/t90000_class.png b/docs/test_cases/t90000_class.png
index 3a516c01..643f4b36 100644
Binary files a/docs/test_cases/t90000_class.png and b/docs/test_cases/t90000_class.png differ