diff --git a/Examples/test-suite/doxygen_misc_constructs.i b/Examples/test-suite/doxygen_misc_constructs.i
index 0eee8aa9d..9426b5909 100644
--- a/Examples/test-suite/doxygen_misc_constructs.i
+++ b/Examples/test-suite/doxygen_misc_constructs.i
@@ -60,7 +60,7 @@
      * used for unspecified parameters.
      * <p>
      *
-     * @link advancedWinIDEALaunching.py Python example. @endlink <br>
+     * @link advancedWinIDEALaunching.py Python example.@endlink <br>
      */
     class CConnectionConfig
     {
diff --git a/Examples/test-suite/java/doxygen_basic_translate_runme.java b/Examples/test-suite/java/doxygen_basic_translate_runme.java
index 395e61139..e6fbd0414 100644
--- a/Examples/test-suite/java/doxygen_basic_translate_runme.java
+++ b/Examples/test-suite/java/doxygen_basic_translate_runme.java
@@ -28,12 +28,12 @@ public class doxygen_basic_translate_runme {
     
     wantedComments.put("doxygen_basic_translate.doxygen_basic_translate.function()",
     		" \n" +
-    		" Brief description. \n" +
+    		" Brief description.\n" +
     		" \n" +
-    		" The comment text \n" +
-    		" @author Some author \n" +
-    		" @return Some number \n" +
-    		" @see function2 \n" +
+    		" The comment text.\n" +
+    		" @author Some author\n" +
+    		" @return Some number\n" +
+    		" @see function2\n" +
     		" \n" +
     		"");
     wantedComments.put("doxygen_basic_translate.doxygen_basic_translate.function2()",
diff --git a/Examples/test-suite/java/doxygen_translate_runme.java b/Examples/test-suite/java/doxygen_translate_runme.java
index b93df89bf..b3db6a816 100644
--- a/Examples/test-suite/java/doxygen_translate_runme.java
+++ b/Examples/test-suite/java/doxygen_translate_runme.java
@@ -152,45 +152,47 @@ public class doxygen_translate_runme {
         wantedComments.put("doxygen_translate.doxygen_translate.htmlFunction(int, float)",
     		" Test for html tags. See Doxygen doc for list of tags recognized by Doxygen.          \n" +
     		"                                                                                      \n" +
-    		" <a href = \"http://acme.com/index.html\">This is link</a>                               \n" +
+    		" <a href=\"http://acme.com/index.html\">This is link</a>                               \n" +
     		" <b>bold</b>                                                                          \n" +
-    		" <blockquote>                                                                         \n" +
+    		" <blockquote cite=\"http://www.worldwildlife.org/who/index.html\">                                                                         \n" +
     		" Quotation block.                                                                     \n" +
     		" </blockquote>                                                                        \n" +
     		" <br>                                                                                 \n" +
     		" <center>center</center>                                                              \n" +
     		" <code>this is code</code>                                                            \n" +
-    		" <dd> Starts an item description.                                                     \n" +
+                "\n" + 
+    		"  <dl>\n" + 
+    		"  <dt>Starts an item title.</dt>\n" + 
+    		"  <dd>Starts an item description.</dd>\n" + 
+    		"  </dl>\n" +
+                "\n" + 
     		" <dfn> Starts a piece of text displayed in a typewriter font.                         \n" +
     		" </dfn>                                                                               \n" +
     		" <div> Starts a section with a specific style (HTML only)                             \n" +
     		" </div>                                                                               \n" +
-    		" <dl> Starts a description list.                                                      \n" +
-    		" <dt> Starts an item title.</dt>                                                      \n" +
-    		" </dl>                                                                                \n" +
-    		" <em> Starts a piece of text displayed in an italic font.                             \n" +
-    		" </em>                                                                                \n" +
+    		" <em> Starts a piece of text displayed in an italic font.</em>                        \n" +
+    		"\n" +
     		" <form> 'Form' does not generate any output.                                          \n" +
     		" </form>                                                                              \n" +
     		" <hr>                                                                                 \n" +
-    		" <h1> Starts an unnumbered section.                                                   \n" +
+    		" <h1> Heading 1                                                   \n" +
     		" </h1>                                                                                \n" +
-    		" <h2> Starts an unnumbered subsection.                                                \n" +
+    		" <h2> Heading 2                                                \n" +
     		" </h2>                                                                                \n" +
-    		" <h3> Starts an unnumbered subsubsection.                                             \n" +
+    		" <h3> Heading 3                                             \n" +
     		" </h3>                                                                                \n" +
-    		" <i> Starts a piece of text displayed in an italic font.                              \n" +
-    		" <input> Does not generate any output.                                                \n" +
-    		" </i>                                                                                 \n" +
+    		" <i>Starts a piece of text displayed in an italic font.</i>                              \n" +
+    		" <input>Input tag.                                                \n" +
+    		"                                                                                  \n" +
     		" <img src=\"slika.png\">                                                                \n" +
-    		" <meta> Does not generate any output.                                                 \n" +
-    		" <multicol> ignored by doxygen.                                                       \n" +
-    		" </multicol> ignored by doxygen.                                                      \n" +
+    		" <meta>Meta tag.                                                 \n" +
+    		" <multicol>Multicol is ignored by doxygen.                                                       \n" +
+    		" </multicol>                                                      \n" +
     		"                                                                                      \n" +
-    		" <ol> Starts a numbered item list.                                                    \n" +
-    		" <li> Starts a new list item.                                                         \n" +
-    		" </li>                                                                                \n" +
-    		" </ol> Ends a numbered item list.                                                     \n" +
+    		" <ol>                                                      \n" +
+    		" <li>List item 1.</li>                                                      \n" +
+    		" <li>List item 2.</li>                                                      \n" +
+    		" </ol>                                                       \n" +
     		"                                                                                      \n" +
     		" <p> Starts a new paragraph.                                                          \n" +
     		" </p>                                                                                 \n" +
@@ -198,18 +200,15 @@ public class doxygen_translate_runme {
     		" </pre>                                                                               \n" +
     		" <small> Starts a section of text displayed in a smaller font.                        \n" +
     		" </small>                                                                             \n" +
-    		" <span> Starts an inline text fragment with a specific style (HTML only)              \n" +
-    		" </span>                                                                              \n" +
-    		" <strong> Starts a section of bold text.                                              \n" +
-    		" </strong>                                                                            \n" +
-    		" <sub> Starts a piece of text displayed in subscript.                                 \n" +
-    		" </sub>                                                                               \n" +
-    		" <sup> Starts a piece of text displayed in superscript.                               \n" +
-    		" </sup>                                                                               \n" +
+    		" <span> Starts an inline text fragment with a specific style.</span>              \n" +
+    		"                                                                               \n" +
+    		" <strong> Starts a section of bold text.</strong>                                              \n" +
+    		" <sub> Starts a piece of text displayed in subscript.</sub>                                 \n" +
+    		" <sup> Starts a piece of text displayed in superscript.</sup>                               \n" +
     		"                                                                                      \n" +
     		" <table border = '1'>                                                                 \n" +
     		" <caption>Animals</caption>                                                           \n" +
-    		" <tr><th> cow   </th><th> dog    </th></tr>                                           \n" +
+    		" <tr><th> Column 1   </th><th> Column 2   </th></tr>                                           \n" +
     		" <tr><td> cow   </td><td> dog    </td></tr>                                           \n" +
     		" <tr><td> cat   </td><td> mouse  </td></tr>                                           \n" +
     		" <tr><td> horse </td><td> parrot </td></tr>                                           \n" +
@@ -220,18 +219,17 @@ public class doxygen_translate_runme {
     		" <kbd> Starts a piece of text displayed in a typewriter font.                         \n" +
     		" </kbd>                                                                               \n" +
     		"                                                                                      \n" +
-    		" <ul> Starts an unnumbered item list.                                                 \n" +
-    		" <li> Starts a new list item 1.</li>                                                  \n" +
-    		" <li> Starts a new list item 2.</li>                                                  \n" +
-    		" <li> Starts a new list item 3.</li>                                                  \n" +
-    		" </ul> Ends an unnumbered item list.                                                  \n" +
+    		"  <ul>\n" +
+    		"  <li>List item 1.</li>\n" +
+    		"  <li>List item 2.</li>\n" +
+    		"  <li>List item 3.</li>\n" +
+    		"  </ul>\n" +
     		"                                                                                      \n" +
-    		" <var> Starts a piece of text displayed in an italic font.                            \n" +
-    		" </var>                                                                               \n" +
+    		" <var> Starts a piece of text displayed in an italic font.</var>                            \n" +
+    		"                                                                                \n" +
                 "\n" +
                 "<u>underlined \\b bold text - doxy commands are ignored inside 'htmlonly' section </u>\n" +
                 "\n" +
-                "&lt;u&gt;underlined text&lt;u&gt;\n" +
                 "");
 
         wantedComments.put("doxygen_translate.doxygen_translate.htmlEntitiesFunction(int, float)",
diff --git a/Examples/test-suite/python/doxygen_misc_constructs_runme.py b/Examples/test-suite/python/doxygen_misc_constructs_runme.py
index d2f04a874..1c2c55236 100755
--- a/Examples/test-suite/python/doxygen_misc_constructs_runme.py
+++ b/Examples/test-suite/python/doxygen_misc_constructs_runme.py
@@ -16,6 +16,7 @@ commentVerifier.check(doxygen_misc_constructs.getAddress.__doc__,
     isGetSize (bool) -- if set, for every object location both address and size are returned
 
   Connection::getId() 
+
   """)
 
 commentVerifier.check(doxygen_misc_constructs.CConnectionConfig.__doc__,
@@ -31,7 +32,9 @@ commentVerifier.check(doxygen_misc_constructs.CConnectionConfig.__doc__,
     used for unspecified parameters.
 
 
-    advancedWinIDEALaunching.py Python example. 
+
+    advancedWinIDEALaunching.py Python example.
+
     """)
 
 commentVerifier.check(doxygen_misc_constructs.waitTime.__doc__,
diff --git a/Examples/test-suite/python/doxygen_translate_all_tags_runme.py b/Examples/test-suite/python/doxygen_translate_all_tags_runme.py
index ecccc1fc5..3009caf64 100755
--- a/Examples/test-suite/python/doxygen_translate_all_tags_runme.py
+++ b/Examples/test-suite/python/doxygen_translate_all_tags_runme.py
@@ -251,7 +251,7 @@ r"""
 
 
 
-  function
+  See also: function
 
   Same as
   brief description