diff --git a/src/autotests/commentparser.cpp b/src/autotests/commentparser.cpp
index 7089e6a..f58f839 100644
--- a/src/autotests/commentparser.cpp
+++ b/src/autotests/commentparser.cpp
@@ -1,355 +1,376 @@
 /**
  * Copyright (C) 2019 Michael Reeves <reeves.87@gmail.com>
  *
  * This file is part of KDiff3.
  *
  * KDiff3 is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * KDiff3 is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with KDiff3.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <QTest>
 
 #include "../CommentParser.h"
 
 class CommentParserTest : public QObject
 {
     Q_OBJECT
   private slots:
     void init()
     {
         DefaultCommentParser parser;
 
         //Sanity check defaults.
         QVERIFY(!parser.isPureComment());
         QVERIFY(!parser.isEscaped());
         QVERIFY(!parser.inString());
         QVERIFY(!parser.inComment());
     }
 
     void singleLineComment()
     {
         DefaultCommentParser test;
 
         test.processLine("//ddj ?*8");
         QVERIFY(!test.inComment());
         QVERIFY(test.isPureComment());
 
         //ignore trailing+leading whitespace
         test = DefaultCommentParser();
         test.processLine("\t  \t  // comment     ");
         QVERIFY(!test.inComment());
         QVERIFY(test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("//comment with quotes embedded \"\"");
         QVERIFY(!test.inComment());
         QVERIFY(test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("anythis//endof line comment");
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("anythis//ignore embedded multiline sequence  /*");
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
     }
 
     void inComment()
     {
         DefaultCommentParser test;
 
         test.mCommentType = DefaultCommentParser::multiLine;
         QVERIFY(test.inComment());
 
         test.mCommentType = DefaultCommentParser::singleLine;
         QVERIFY(test.inComment());
 
         test.mCommentType = DefaultCommentParser::none;
         QVERIFY(!test.inComment());
     }
 
     void multiLineComment()
     {
         DefaultCommentParser test;
 
         //mutiline syntax on one line
         test.processLine("/* kjd*/");
         QVERIFY(test.isPureComment());
         QVERIFY(!test.inComment());
 
         //mid line comment start.
         test = DefaultCommentParser();
         test.processLine("fskk /* kjd */");
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         //mid line comment start. multiple lines
         test = DefaultCommentParser();
         test.processLine("fskk /* kjd ");
         QVERIFY(test.inComment());
         QVERIFY(!test.isPureComment());
 
         test.processLine("  comment line ");
         QVERIFY(test.inComment());
         QVERIFY(test.isPureComment());
 
         test.processLine("  comment */ not comment ");
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         //mid line comment start. multiple lines
         test = DefaultCommentParser();
         test.processLine("fskk /* kjd ");
         QVERIFY(test.inComment());
         QVERIFY(!test.isPureComment());
 
         test.processLine("  comment line ");
         QVERIFY(test.inComment());
         QVERIFY(test.isPureComment());
+
+        test.processLine("  comment * line /  ");
+        QVERIFY(test.inComment());
+        QVERIFY(test.isPureComment());
         //embedded single line character sequence should not end comment
         test.processLine("  comment line //");
         QVERIFY(test.inComment());
         QVERIFY(test.isPureComment());
 
         test.processLine("  comment */");
         QVERIFY(!test.inComment());
         QVERIFY(test.isPureComment());
 
         //Escape squeances not relavate to comments
         test = DefaultCommentParser();
         test.processLine("/*  comment \\*/");
         QVERIFY(!test.inComment());
         QVERIFY(test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("  int i = 8 / 8 * 3;/* comment*/");
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         //invalid in C++ should not be flagged as pure comment
         test.processLine("/*  comment */ */");
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         //leading whitespace
         test = DefaultCommentParser();
         test.processLine("\t  \t  /*  comment */");
         QVERIFY(!test.inComment());
         QVERIFY(test.isPureComment());
 
         //trailing whitespace
         test = DefaultCommentParser();
         test.processLine("\t  \t  /*  comment */    ");
         QVERIFY(!test.inComment());
         QVERIFY(test.isPureComment());
     }
 
     void stringTest()
     {
         DefaultCommentParser test;
 
         test.processLine("\"quoted string // \"");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("\"quoted string /* \"");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("\"\"");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processChar("\"", '"');
         QVERIFY(!test.isEscaped());
         QVERIFY(test.inString());
 
         test.processChar("\"'", '\'');
         QVERIFY(test.inString());
         test.processChar("\"'\"", '"');
         QVERIFY(!test.inString());
 
         //test only escape sequence we care about
         test = DefaultCommentParser();
         test.processChar("\"", '"');
 
         test.processChar("\"", '\\');
         QVERIFY(test.isEscaped());
         QVERIFY(test.inString());
 
         test.processChar("\"\\\"", '"');
         QVERIFY(!test.isEscaped());
         QVERIFY(test.inString());
 
         test.processChar("\"\\\"\"", '"');
         QVERIFY(!test.isEscaped());
         QVERIFY(!test.inString());
     }
 
     void quotedCharacter()
     {
         DefaultCommentParser test;
 
         test.processLine("'\"'");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test.processLine("'a'");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test.processLine("'\\\''");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test.processLine("'*'");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test.processLine("'/'");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
     }
 
     void nonComment()
     {
         DefaultCommentParser test;
 
         test.processLine("  int i = 8 / 8 * 3;");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("  ");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("  / ");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
 
         test = DefaultCommentParser();
         test.processLine("  * ");
         QVERIFY(!test.inString());
         QVERIFY(!test.inComment());
         QVERIFY(!test.isPureComment());
+
+        //invalid in C++ should not be flagged as non-comment
+        test.processLine(" */");
+        QVERIFY(!test.inString());
+        QVERIFY(!test.inComment());
+        QVERIFY(!test.isPureComment());
     }
 
     void removeComment()
     {
         DefaultCommentParser test;
         QString line=QLatin1String("  int i = 8 / 8 * 3;"), correct=QLatin1String("  int i = 8 / 8 * 3;");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
+        QVERIFY(line.length() == correct.length());
         
         test = DefaultCommentParser();
         correct = line = QLatin1String("  //int i = 8 / 8 * 3;");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
 
         test = DefaultCommentParser();
         correct = line = QLatin1String("//  int i = 8 / 8 * 3;");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
+        QVERIFY(line.length() == correct.length());
 
         test = DefaultCommentParser();
         line = QLatin1String("  int i = 8 / 8 * 3;// comment");
         correct = QLatin1String("  int i = 8 / 8 * 3;          ");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
         QVERIFY(line.length() == correct.length());
 
         test = DefaultCommentParser();
         line = QLatin1String("  int i = 8 / 8 * 3;/* comment");
         correct = QLatin1String("  int i = 8 / 8 * 3;          ");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
+        QVERIFY(line.length() == correct.length());
         
         correct = line = QLatin1String("  int i = 8 / 8 * 3;/* mot a comment");
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
         QVERIFY(line.length() == correct.length());
 
         //end comment mid-line
         line = QLatin1String("d  */ why");
         correct = QLatin1String("      why");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
         QVERIFY(line.length() == correct.length());
         
         test = DefaultCommentParser();
         line = QLatin1String("  int i = 8 / 8 * 3;/* comment*/");
         correct = QLatin1String("  int i = 8 / 8 * 3;            ");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
         QVERIFY(line.length() == correct.length());
         
         test = DefaultCommentParser();
         correct = line = QLatin1String("  /*int i = 8 / 8 * 3;/* comment*/");
 
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
+        QVERIFY(line.length() == correct.length());
 
         //line with multiple comments wierd but legal c/c++
         test = DefaultCommentParser();
         line = QLatin1String("  int /*why?*/ i = 8 / 8 * 3;/* comment*/");
         correct = QLatin1String("  int          i = 8 / 8 * 3;            ");
         test.processLine(line);
         test.removeComment(line);
         QVERIFY(line == correct);
         QVERIFY(line.length() == correct.length());
+
+        //invalid in C++ should not be flagged as non-comment
+        test = DefaultCommentParser();
+        line = correct = " */";
+        test.processLine(" */");
+        QVERIFY(line == correct);
+        QVERIFY(line.length() == correct.length());
     }
 };
 
 QTEST_MAIN(CommentParserTest);
 
 #include "commentparser.moc"