diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index 465a28207..e9aa3ddff 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -1149,10 +1149,11 @@ void TemplateSimplifier::expandTemplate(
             // replace name..
             if (tok3->str() == lastName) {
                 if (Token::simpleMatch(tok3->next(), "<")) {
-                    // replace multi token name with single token name
-                    if (tok3 == templateDeclarationNameToken || Token::Match(tok3, newName.c_str())) {
-                        Token *closingBracket = tok3->next()->findClosingBracket();
-                        if (closingBracket) {
+                    Token *closingBracket = tok3->next()->findClosingBracket();
+                    if (closingBracket) {
+                        // replace multi token name with single token name
+                        if (tok3 == templateDeclarationNameToken ||
+                            Token::Match(tok3, newName.c_str())) {
                             if (copy) {
                                 mTokenList.addtoken(newName, tok3->linenr(), tok3->fileIndex());
                                 tok3 = closingBracket;
@@ -1161,11 +1162,12 @@ void TemplateSimplifier::expandTemplate(
                                 eraseTokens(tok3, closingBracket->next());
                             }
                             continue;
+                        } else if (!templateDeclaration.scope.empty() &&
+                                   !alreadyHasNamespace(templateDeclaration, tok3) &&
+                                   closingBracket->strAt(1) != "(") {
+                            if (copy)
+                                addNamespace(templateDeclaration, tok3);
                         }
-                    } else if (!templateDeclaration.scope.empty() &&
-                               !alreadyHasNamespace(templateDeclaration, tok3)) {
-                        if (copy)
-                            addNamespace(templateDeclaration, tok3);
                     }
                 } else {
                     if (copy) {
diff --git a/lib/token.cpp b/lib/token.cpp
index bce14ced5..43ab57d67 100644
--- a/lib/token.cpp
+++ b/lib/token.cpp
@@ -950,10 +950,6 @@ const Token *Token::findmatch(const Token * const startTok, const char pattern[]
 
 void Token::insertToken(const std::string &tokenStr, const std::string &originalNameStr, bool prepend)
 {
-    //TODO: Find a solution for the first token on the list
-    if (prepend && !this->previous())
-        return;
-
     Token *newToken;
     if (mStr.empty())
         newToken = this;
@@ -969,12 +965,12 @@ void Token::insertToken(const std::string &tokenStr, const std::string &original
         newToken->mProgressValue = mProgressValue;
 
         if (prepend) {
-            /*if (this->previous())*/ {
+            if (this->previous()) {
                 newToken->previous(this->previous());
                 newToken->previous()->next(newToken);
-            } /*else if (tokensFront?) {
-              *tokensFront? = newToken;
-              }*/
+            } else if (mTokensFrontBack) {
+                mTokensFrontBack->front = newToken;
+            }
             this->previous(newToken);
             newToken->next(this);
         } else {
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index 08d77bc76..93937c873 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -129,6 +129,7 @@ private:
         TEST_CASE(template_namespace_7); // #8768
         TEST_CASE(template_namespace_8);
         TEST_CASE(template_namespace_9);
+        TEST_CASE(template_namespace_10);
 
         // Test TemplateSimplifier::templateParameters
         TEST_CASE(templateParameters);
@@ -192,7 +193,8 @@ private:
         const char code[] = "template <class T> class Fred { T a; };\n"
                             "Fred<int> fred;";
 
-        const char expected[] = "Fred<int> fred ; "
+        const char expected[] = "class Fred<int> ; "
+                                "Fred<int> fred ; "
                                 "class Fred<int> { int a ; } ;";
 
         ASSERT_EQUALS(expected, tok(code));
@@ -202,7 +204,8 @@ private:
         const char code[] = "template <class T, int sz> class Fred { T data[sz]; };\n"
                             "Fred<float,4> fred;";
 
-        const char expected[] = "Fred<float,4> fred ; "
+        const char expected[] = "class Fred<float,4> ; "
+                                "Fred<float,4> fred ; "
                                 "class Fred<float,4> { float data [ 4 ] ; } ;";
 
         ASSERT_EQUALS(expected, tok(code));
@@ -212,7 +215,8 @@ private:
         const char code[] = "template <class T> class Fred { Fred(); };\n"
                             "Fred<float> fred;";
 
-        const char expected[] = "Fred<float> fred ; "
+        const char expected[] = "class Fred<float> ; "
+                                "Fred<float> fred ; "
                                 "class Fred<float> { Fred<float> ( ) ; } ;";
 
         ASSERT_EQUALS(expected, tok(code));
@@ -223,7 +227,8 @@ private:
                             "template <class T> Fred<T>::Fred() { }\n"
                             "Fred<float> fred;";
 
-        const char expected[] = "Fred<float> fred ; "
+        const char expected[] = "class Fred<float> ; "
+                                "Fred<float> fred ; "
                                 "class Fred<float> { } ; "
                                 "Fred<float> :: Fred<float> ( ) { }";
 
@@ -235,7 +240,8 @@ private:
                             "Fred<float> fred1;\n"
                             "Fred<float> fred2;";
 
-        const char expected[] = "Fred<float> fred1 ; "
+        const char expected[] = "class Fred<float> ; "
+                                "Fred<float> fred1 ; "
                                 "Fred<float> fred2 ; "
                                 "class Fred<float> { } ;";
 
@@ -349,7 +355,8 @@ private:
                             "} ;\n";
 
         // The expected result..
-        const char expected[] = "void f ( ) { A<int> a ; } "
+        const char expected[] = "class A<int> ; "
+                                "void f ( ) { A<int> a ; } "
                                 "template < typename T > class B { void g ( ) { A < T > b ; b = A < T > :: h ( ) ; } } ; "
                                 "class A<int> { } ;";
 
@@ -403,7 +410,8 @@ private:
                             "}\n";
 
         // The expected result..
-        const char expected[] = "void f ( ) "
+        const char expected[] = "class A<12,12,11> ; "
+                                "void f ( ) "
                                 "{"
                                 " A<12,12,11> a ; "
                                 "} "
@@ -490,7 +498,8 @@ private:
                              "};\n"
                              "\n"
                              "vec<4> v;";
-        const char expected2[] = "vec<4> v ; "
+        const char expected2[] = "struct vec<4> ; "
+                                 "vec<4> v ; "
                                  "struct vec<4> { "
                                  "vec<4> ( ) { } "
                                  "vec<4> ( const vec < 4 - 1 > & v ) { } "
@@ -539,7 +548,8 @@ private:
         const char code[] = "template <class T> class foo { T a; };\n"
                             "foo<int> *f;";
 
-        const char expected[] = "foo<int> * f ; "
+        const char expected[] = "class foo<int> ; "
+                                "foo<int> * f ; "
                                 "class foo<int> { int a ; } ;";
 
         ASSERT_EQUALS(expected, tok(code));
@@ -570,7 +580,8 @@ private:
                             "A<int> a;\n";
 
         // The expected result..
-        const char expected[] = "A<int> a ; "
+        const char expected[] = "class A<int> ; "
+                                "A<int> a ; "
                                 "class A<int> { public: ~ A<int> ( ) ; } ; "
                                 "A<int> :: ~ A<int> ( ) { }";
         ASSERT_EQUALS(expected, tok(code));
@@ -581,7 +592,8 @@ private:
             const char code[] = "template <class T> struct Fred { T a; };\n"
                                 "Fred<int> fred;";
 
-            const char expected[] = "Fred<int> fred ; "
+            const char expected[] = "struct Fred<int> ; "
+                                    "Fred<int> fred ; "
                                     "struct Fred<int> { int a ; } ;";
 
             ASSERT_EQUALS(expected, tok(code));
@@ -591,7 +603,8 @@ private:
             const char code[] = "template <class T, int sz> struct Fred { T data[sz]; };\n"
                                 "Fred<float,4> fred;";
 
-            const char expected[] = "Fred<float,4> fred ; "
+            const char expected[] = "struct Fred<float,4> ; "
+                                    "Fred<float,4> fred ; "
                                     "struct Fred<float,4> { float data [ 4 ] ; } ;";
 
             ASSERT_EQUALS(expected, tok(code));
@@ -601,7 +614,8 @@ private:
             const char code[] = "template <class T> struct Fred { Fred(); };\n"
                                 "Fred<float> fred;";
 
-            const char expected[] = "Fred<float> fred ; "
+            const char expected[] = "struct Fred<float> ; "
+                                    "Fred<float> fred ; "
                                     "struct Fred<float> { Fred<float> ( ) ; } ;";
 
             ASSERT_EQUALS(expected, tok(code));
@@ -612,7 +626,8 @@ private:
                                 "Fred<float> fred1;\n"
                                 "Fred<float> fred2;";
 
-            const char expected[] = "Fred<float> fred1 ; "
+            const char expected[] = "struct Fred<float> ; "
+                                    "Fred<float> fred1 ; "
                                     "Fred<float> fred2 ; "
                                     "struct Fred<float> { } ;";
 
@@ -624,7 +639,8 @@ private:
         const char code[] = "template <class T> struct Fred { T a; };\n"
                             "Fred<std::string> fred;";
 
-        const char expected[] = "Fred<std::string> fred ; "
+        const char expected[] = "struct Fred<std::string> ; "
+                                "Fred<std::string> fred ; "
                                 "struct Fred<std::string> { std :: string a ; } ;";
 
         ASSERT_EQUALS(expected, tok(code));
@@ -655,7 +671,8 @@ private:
                             "{};\n"
                             "\n"
                             "bitset<1> z;";
-        const char expected[] = "class bitset<1> ; "
+        const char expected[] = "struct B<4> ; "
+                                "class bitset<1> ; "
                                 "bitset<1> z ; "
                                 "class bitset<1> : B<4> { } ; "
                                 "struct B<4> { int a [ 4 ] ; } ;";
@@ -709,7 +726,11 @@ private:
         // #3226 - inner template
         const char code[] = "template<class A, class B> class Fred {};\n"
                             "Fred<int,Fred<int,int> > x;\n";
-        ASSERT_EQUALS("Fred<int,Fred<int,int>> x ; class Fred<int,int> { } ; class Fred<int,Fred<int,int>> { } ;", tok(code));
+        ASSERT_EQUALS("class Fred<int,int> ; "
+                      "class Fred<int,Fred<int,int>> ; "
+                      "Fred<int,Fred<int,int>> x ; "
+                      "class Fred<int,int> { } ; "
+                      "class Fred<int,Fred<int,int>> { } ;", tok(code));
     }
 
     void template30() {
@@ -721,11 +742,15 @@ private:
     void template31() {
         // #4010 - template reference type
         const char code[] = "template<class T> struct A{}; A<int&> a;";
-        ASSERT_EQUALS("A<int&> a ; struct A<int&> { } ;", tok(code));
+        ASSERT_EQUALS("struct A<int&> ; "
+                      "A<int&> a ; "
+                      "struct A<int&> { } ;", tok(code));
 
         // #7409 - rvalue
         const char code2[] = "template<class T> struct A{}; A<int&&> a;";
-        ASSERT_EQUALS("A<int&&> a ; struct A<int&&> { } ;", tok(code2));
+        ASSERT_EQUALS("struct A<int&&> ; "
+                      "A<int&&> a ; "
+                      "struct A<int&&> { } ;", tok(code2));
     }
 
     void template32() {
@@ -753,7 +778,8 @@ private:
                                 "template<class T> struct B { };\n"
                                 "template<class T> struct C { A<B<X<T> > > ab; };\n"
                                 "C<int> c;";
-            ASSERT_EQUALS("struct B<X<int>> ; "
+            ASSERT_EQUALS("struct A<B<X<int>>> ; "
+                          "struct B<X<int>> ; "
                           "struct C<int> ; "
                           "C<int> c ; "
                           "struct C<int> { A<B<X<int>>> ab ; } ; "
@@ -788,14 +814,17 @@ private:
     void template35() { // #4074 - "A<'x'> a;" is not recognized as template instantiation
         const char code[] = "template <char c> class A {};\n"
                             "A <'x'> a;";
-        ASSERT_EQUALS("A<'x'> a ; class A<'x'> { } ;", tok(code));
+        ASSERT_EQUALS("class A<'x'> ; "
+                      "A<'x'> a ; "
+                      "class A<'x'> { } ;", tok(code));
     }
 
     void template36() { // #4310 - Passing unknown template instantiation as template argument
         const char code[] = "template <class T> struct X { T t; };\n"
                             "template <class C> struct Y { Foo < X< Bar<C> > > _foo; };\n" // <- Bar is unknown
                             "Y<int> bar;";
-        ASSERT_EQUALS("struct Y<int> ; "
+        ASSERT_EQUALS("struct X<Bar<int>> ; "
+                      "struct Y<int> ; "
                       "Y<int> bar ; "
                       "struct Y<int> { Foo < X<Bar<int>> > _foo ; } ; "
                       "struct X<Bar<int>> { Bar < int > t ; } ;",
@@ -870,7 +899,9 @@ private:
     void template41() { // #4710 - const in template instantiation not handled perfectly
         const char code1[] = "template<class T> struct X { };\n"
                              "void f(const X<int> x) { }";
-        ASSERT_EQUALS("void f ( const X<int> x ) { } struct X<int> { } ;", tok(code1));
+        ASSERT_EQUALS("struct X<int> ; "
+                      "void f ( const X<int> x ) { } "
+                      "struct X<int> { } ;", tok(code1));
 
         const char code2[] = "template<class T> T f(T t) { return t; }\n"
                              "int x() { return f<int>(123); }";
@@ -961,7 +992,9 @@ private:
                             "template void Fred<float>::f();\n"
                             "template void Fred<int>::g();\n";
 
-        const char expected[] = "template void Fred<float> :: f ( ) ; "
+        const char expected[] = "class Fred<float> ; "
+                                "class Fred<int> ; "
+                                "template void Fred<float> :: f ( ) ; "
                                 "template void Fred<int> :: g ( ) ; "
                                 "class Fred<float> { void f ( ) ; void g ( ) ; } ; "
                                 "void Fred<float> :: f ( ) { } "
@@ -1043,7 +1076,10 @@ private:
 
         // Similar problem can also happen with ...
         ASSERT_EQUALS(
-            "A<int> a ( 0 ) ; struct A<int> { "
+            "struct A<int> ; "
+            "struct A<int...> ; "
+            "A<int> a ( 0 ) ; "
+            "struct A<int> { "
             "A<int> ( int * p ) { p ; } "
             "} ; "
             "struct A<int...> { "
@@ -1072,7 +1108,8 @@ private:
     void template57() { // #7891
         const char code[] = "template<class T> struct Test { Test(T); };\n"
                             "Test<unsigned long> test( 0 );";
-        const char exp [] = "Test<unsignedlong> test ( 0 ) ; "
+        const char exp [] = "struct Test<unsignedlong> ; "
+                            "Test<unsignedlong> test ( 0 ) ; "
                             "struct Test<unsignedlong> { Test<unsignedlong> ( long ) ; } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
@@ -1110,7 +1147,11 @@ private:
                             "int main () {\n"
                             "    return diagonalGroupTest<4>();\n"
                             "}";
-        const char exp[] = "struct Factorial<0> { enum FacHelper { value = 1 } ; } ; "
+        const char exp[] = "struct Factorial<4> ; "
+                           "struct Factorial<3> ; "
+                           "struct Factorial<2> ; "
+                           "struct Factorial<1> ; "
+                           "struct Factorial<0> { enum FacHelper { value = 1 } ; } ; "
                            "int main ( ) { return diagonalGroupTest<4> ( ) ; } "
                            "int diagonalGroupTest<4> ( ) { return Factorial<4> :: value ; } "
                            "struct Factorial<4> { enum FacHelper { value = 4 * Factorial<3> :: value } ; } ; "
@@ -1126,7 +1167,8 @@ private:
                             "template <typename T> void h() { f<typename S<T>::type(0)>(); }\n"
                             "\n"
                             "void j() { h<int>(); }";
-        const char exp[] = "template < typename T > void f ( ) { } " // <- TODO: This template is not expanded
+        const char exp[] = "struct S<int> ; "
+                           "template < typename T > void f ( ) { } " // <- TODO: This template is not expanded
                            "void j ( ) { h<int> ( ) ; } "
                            "void h<int> ( ) { f < S<int> :: type ( 0 ) > ( ) ; } "
                            "struct S<int> { } ;";
@@ -1140,7 +1182,8 @@ private:
                             "  Foo<Bar<T>> f2() { }\n"
                             "};\n"
                             "Bar<int> c;";
-        const char exp[] = "struct Bar<int> ; "
+        const char exp[] = "struct Foo<Bar<int>> ; "
+                           "struct Bar<int> ; "
                            "Bar<int> c ; "
                            "struct Bar<int> {"
                            " void f1 ( Bar<int> x ) { }"
@@ -1156,7 +1199,8 @@ private:
                             "template <class T, unsigned S> class C3 {};\n"
                             "template <class T, unsigned S> C3<T, S>::C3(const C3<T, S> &v) { C1<T *> c1; }\n"
                             "C3<int,6> c3;";
-        const char exp[] = "template < class T > void f ( ) { x = y ? ( C1 < int > :: allocate ( 1 ) ) : 0 ; } "
+        const char exp[] = "struct C1<int*> ; "
+                           "template < class T > void f ( ) { x = y ? ( C1 < int > :: allocate ( 1 ) ) : 0 ; } "
                            "class C3<int,6> ; "
                            "C3<int,6> c3 ; "
                            "class C3<int,6> { } ; "
@@ -1166,8 +1210,11 @@ private:
     }
 
     void template63() { // #8576
-        const char code[] = "template<class T> struct TestClass { T m_hi; }; TestClass<std::auto_ptr<v>> objTest3;";
-        const char exp[] = "TestClass<std::auto_ptr<v>> objTest3 ; struct TestClass<std::auto_ptr<v>> { std :: auto_ptr < v > m_hi ; } ;";
+        const char code[] = "template<class T> struct TestClass { T m_hi; };"
+                            "TestClass<std::auto_ptr<v>> objTest3;";
+        const char exp[] = "struct TestClass<std::auto_ptr<v>> ; "
+                           "TestClass<std::auto_ptr<v>> objTest3 ; "
+                           "struct TestClass<std::auto_ptr<v>> { std :: auto_ptr < v > m_hi ; } ;";
         ASSERT_EQUALS(exp, tok(code));
     }
 
@@ -1214,7 +1261,9 @@ private:
                             "};\n"
                             "template <class T> const int ** Fred<T>::foo() { return nullptr; }\n"
                             "Fred<int> fred;";
-        const char exp [] = "Fred<int> fred ; struct Fred<int> { "
+        const char exp [] = "struct Fred<int> ; "
+                            "Fred<int> fred ; "
+                            "struct Fred<int> { "
                             "const int * * foo ( ) ; "
                             "} ; "
                             "const int * * Fred<int> :: foo ( ) { return nullptr ; }";
@@ -1236,7 +1285,8 @@ private:
                             "template <class T> Containter<T>::~Containter() {}\n"
                             "Containter<int> intContainer;";
 
-        const char expected[] = "Containter<int> intContainer ; "
+        const char expected[] = "struct Containter<int> ; "
+                                "Containter<int> intContainer ; "
                                 "struct Containter<int> { "
                                 "Containter<int> ( ) ; "
                                 "Containter<int> ( const Containter<int> & ) ; "
@@ -1259,7 +1309,9 @@ private:
                             "    T value;\n"
                             "};\n"
                             "Fred<int> fred;";
-        const char exp [] = "Fred<int> fred ; union Fred<int> { "
+        const char exp [] = "union Fred<int> ; "
+                            "Fred<int> fred ; "
+                            "union Fred<int> { "
                             "char dummy [ 4 ] ; "
                             "int value ; "
                             "} ;";
@@ -1391,7 +1443,9 @@ private:
                                 "}\n";
 
             // The expected result..
-            const char expected[] = "void f ( ) "
+            const char expected[] = "class A<int,2> ; "
+                                    "class A<int,3> ; "
+                                    "void f ( ) "
                                     "{"
                                     " A<int,2> a1 ;"
                                     " A<int,3> a2 ; "
@@ -1414,7 +1468,8 @@ private:
                                 "}\n";
 
             // The expected result..
-            const char expected[] = "void f ( ) "
+            const char expected[] = "class A<int,3,2> ; "
+                                    "void f ( ) "
                                     "{"
                                     " A<int,3,2> a1 ;"
                                     " A<int,3,2> a2 ; "
@@ -1447,7 +1502,8 @@ private:
                                   " class A<int,3>"
                                   " { int ar [ 3 ] ; }";
 
-            const char current[] = "void f ( ) "
+            const char current[] = "class A<int,3> ; "
+                                   "void f ( ) "
                                    "{ "
                                    "A < int , ( int ) 2 > a1 ; "
                                    "A<int,3> a2 ; "
@@ -1763,7 +1819,9 @@ private:
     void template_namespace_5() {
         const char code[] = "template<class C> struct S {};\n"
                             "namespace X { S<int> s; }";
-        ASSERT_EQUALS("namespace X { S<int> s ; } struct S<int> { } ;", tok(code));
+        ASSERT_EQUALS("struct S<int> ; "
+                      "namespace X { S<int> s ; } "
+                      "struct S<int> { } ;", tok(code));
     }
 
     void template_namespace_6() {
@@ -1891,6 +1949,31 @@ private:
                       "} ;", tok(code));
     }
 
+    void template_namespace_10() {
+        const char code[] = "namespace NS1 {\n"
+                            "namespace NS2 {\n"
+                            "template<class T>\n"
+                            "class Fred {\n"
+                            "    T * t;\n"
+                            "public:\n"
+                            "    Fred<T>() : t(nullptr) {}\n"
+                            "};\n"
+                            "}\n"
+                            "}\n"
+                            "NS1::NS2::Fred<int> fred;";
+        ASSERT_EQUALS("namespace NS1 { "
+                      "namespace NS2 { "
+                      "class Fred<int> ; "
+                      "} "
+                      "} "
+                      "NS1 :: NS2 :: Fred<int> fred ; class NS1 :: NS2 :: Fred<int> "
+                      "{ "
+                      "int * t ; "
+                      "public: "
+                      "Fred<int> ( ) : t ( nullptr ) { } "
+                      "} ;", tok(code));
+    }
+
     unsigned int templateParameters(const char code[]) {
         Tokenizer tokenizer(&settings, this);
 
@@ -2127,7 +2210,8 @@ private:
                                 "template<> class C<char> { };\n"
                                 "map<int> m;\n"
                                 "C<int> i;";
-            const char expected[] = "class C<char> { } ; "
+            const char expected[] = "class C<int> ; "
+                                    "class C<char> { } ; "
                                     "map < int > m ; "
                                     "C<int> i ; "
                                     "class C<int> { } ;";
@@ -2139,7 +2223,8 @@ private:
                                 "map<int> m;\n"
                                 "C<int> i;\n"
                                 "C<char> c;";
-            const char expected[] = "class C<char> { } ; "
+            const char expected[] = "class C<int> ; "
+                                    "class C<char> { } ; "
                                     "map < int > m ; "
                                     "C<int> i ; "
                                     "C<char> c ; "
@@ -2153,7 +2238,9 @@ private:
                             "template<class T> using Bar = Foo<T,3>;\n"
                             "Bar<int> b;\n";
 
-        const char expected[] = "; Foo<int,3> b ; struct Foo<int,3> { } ;";
+        const char expected[] = "struct Foo<int,3> ; "
+                                "Foo<int,3> b ; "
+                                "struct Foo<int,3> { } ;";
 
         ASSERT_EQUALS(expected, tok(code));
     }
@@ -2175,7 +2262,9 @@ private:
         const char code[] = "template <int> struct Tag {};\n"
                             "template <int ID> using SPtr = std::shared_ptr<void(Tag<ID>)>;\n"
                             "SPtr<0> s;";
-        const char expected[] = "; std :: shared_ptr < void ( Tag<0> ) > s ; struct Tag<0> { } ;";
+        const char expected[] = "struct Tag<0> ; "
+                                "std :: shared_ptr < void ( Tag<0> ) > s ; "
+                                "struct Tag<0> { } ;";
         ASSERT_EQUALS(expected, tok(code));
     }
 
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index dfc37643c..c80caf2bd 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -840,7 +840,11 @@ private:
                                 "};\n"
                                 "template <class T> Containter<T>::Containter() : mElements(nullptr) {}\n"
                                 "Containter<int> intContainer;";
-            const char exp [] = "6: Containter<int> intContainer@1 ; struct Containter<int> {\n"
+            const char exp [] = "1: struct Containter<int> ;\n"
+                                "2:\n"
+                                "|\n"
+                                "5:\n"
+                                "6: Containter<int> intContainer@1 ; struct Containter<int> {\n"
                                 "2: Containter<int> ( ) ;\n"
                                 "3: int * mElements@2 ;\n"
                                 "4: } ;\n"