diff --git a/test/import/cxx/comments-class-members.h b/test/import/cxx/comments-class-members.h
index f8c6e4cdb..2c6138e2b 100644
--- a/test/import/cxx/comments-class-members.h
+++ b/test/import/cxx/comments-class-members.h
@@ -1,16 +1,38 @@
 
 // class comments_class_members_test
 class comments_class_members_test {
 public:
-    // member variable1 c++ style single line comment
-    int variable1;
+    /* member variable10 c-style single lime comment */
+    int variable10;
+
+    /** member variable11 c doxygen style single lime comment */
+    int variable11;
 
     /*
-     * member variable2
+     * member variable20
      * c-style multi line comment
      */
-    int variable2;
+    int variable20;
+
+    /**
+     * member variable21
+     * c doxygen style multi line comment
+     */
+    int variable21;
+
+    // member variable30 c++ style single line comment
+    int variable30;
+
+    /// member variable31 c++ doxygen style single line comment
+    int variable31;
+
+    // member variable40 c++ style multi line comment 1 of 3 lines
+    // member variable40 c++ style multi line comment 2 of 3 lines
+    // member variable40 c++ style multi line comment 3 of 3 lines
+    int variable40;
 
-    /* member variable3 c-style single lime comment */
-    int variable3;
-};
\ No newline at end of file
+    /// member variable41 c++ doxygen style multi line comment 1 of 3 lines
+    /// member variable41 c++ doxygen style multi line comment 2 of 3 lines
+    /// member variable41 c++ doxygen style multi line comment 3 of 3 lines
+    int variable41;
+};
diff --git a/test/import/cxx/comments-class-methods.h b/test/import/cxx/comments-class-methods.h
index dbd989bf9..aa8b69450 100644
--- a/test/import/cxx/comments-class-methods.h
+++ b/test/import/cxx/comments-class-methods.h
@@ -1,16 +1,38 @@
 
 // class comments_class_methods_test
 class comments_class_methods_test {
 public:
-    // method test0 c++ style single line comment
-    void test0();
+    /* method test00 c style single line comment */
+    void test00(char c);
+
+    /** method test21 c doxygen style single line comment */
+    void test01(char c);
+
+    /*
+     * method test10
+     * c-style multiline comment
+     */
+    void test10(char *);
 
     /**
      * method test1
-     * c-style multiline comment
+     * doxygen c-style multiline comment
      */
-    void test1(char *);
+    void test11(char *);
+
+    // method test00 c++ style single line comment
+    void test20();
+
+    /// method test01 c++ doxygen style single line comment
+    void test21();
+
+    // method test30 c++ style multi line comment 1 of 3 lines
+    // method test30 c++ style multi line comment 2 of 3 lines
+    // method test30 c++ style multi line comment 3 of 3 lines
+    void test30();
 
-    /* method test2 c-style single line comment */
-    void test(char c);
-};
\ No newline at end of file
+    /// method test30 c++ doxygen style multi line comment 1 of 3 lines
+    /// method test30 c++ doxygen style multi line comment 2 of 3 lines
+    /// method test30 c++ doxygen style multi line comment 3 of 3 lines
+    void test31();
+};
diff --git a/test/import/cxx/comments-class-operators.h b/test/import/cxx/comments-class-operators.h
new file mode 100644
index 000000000..90c5c8c42
--- /dev/null
+++ b/test/import/cxx/comments-class-operators.h
@@ -0,0 +1,37 @@
+
+// class comments_class_operators_test
+class comments_class_operators_test {
+public:
+    /* operator * c style single line comment */
+    int operator * (int i);
+
+    /** operator / c doxygen style single line comment */
+    int operator / (int i);
+
+    /*
+     * operator % comment
+     * c-style multiline comment
+     */
+    int operator % (int i);
+
+    /**
+     * operator | comment
+     * c doxygen style multiline comment
+     */
+    int operator | (int i);
+
+    // operator && description  c++ style single line comment
+    int operator && (int i);
+
+    /// operator || c++ doxygen style single line comment
+    int operator || (int i);
+
+    // operator + description line 1 out of 3 (c++ style)
+    // operator + description line 2 out of 3 (c++ style)
+    // operator + description line 3 out of 3 (c++ style)
+    int operator + (int i);
+
+    /// operator - description line 1 out of 2 (c++ doxygen style)
+    /// operator - description line 2 out of 2 (c++ doxygen style)
+    int operator - (int i);
+};
diff --git a/test/import/cxx/comments-class.h b/test/import/cxx/comments-class.h
index 2d2b87b07..d0228ded3 100644
--- a/test/import/cxx/comments-class.h
+++ b/test/import/cxx/comments-class.h
@@ -1,12 +1,49 @@
+// independent comment 1
 
-// class comments_class_test1 c++ style single line comment
-class comments_class_test1 {};
+// class comments_class_test1a c++ style single line comment
+class comments_class_test1a {};
 
-/**
- * class comments_class_test2
+// independent comment 2
+
+/// class comments_class_test1b doxygen c++ style single line comment
+class comments_class_test1b {};
+
+// independent comment 3
+
+// class comments_class_test1c c++ style multi line comment 1 of 2 lines
+// class comments_class_test1c c++ style multi line comment 2 of 2 lines
+class comments_class_test1c {};
+
+// independent comment 4
+
+// class comments_class_test1d c++ style multi line comment 1 of 3 lines
+// class comments_class_test1d c++ style multi line comment 2 of 3 lines
+// class comments_class_test1d c++ style multi line comment 3 of 3 lines
+class comments_class_test1d {};
+
+// independent comment 5
+
+/// class comments_class_test1e doxygen c++ style multi line comment 1 of 3 lines
+/// class comments_class_test1e doxygen c++ style multi line comment 2 of 3 lines
+/// class comments_class_test1e doxygen c++ style multi line comment 3 of 3 lines
+class comments_class_test1e {};
+
+// independent comment 6
+
+/*
+ * class comments_class_test2a
  * c-style multiline comment
  */
-class comments_class_test2 {};
+class comments_class_test2a {};
+
+// independent comment 7
+
+/**
+ * class comments_class_test2b
+ * doxygen c-style multiline comment
+ */
+class comments_class_test2b {};
+
+/* class comments_class_test2c c-style single line comment */
+class comments_class_test2c {};
 
-/* class comments_class_test3 c-style single line comment */
-class comments_class_test3 {};
diff --git a/test/import/cxx/comments.h b/test/import/cxx/comments.h
index 2a40130b2..975b1877a 100644
--- a/test/import/cxx/comments.h
+++ b/test/import/cxx/comments.h
@@ -1,8 +1,9 @@
 #include "comments-class-methods.h"
 #include "comments-class-members.h"
 #include "comments-class-enums.h"
+#include "comments-class-operators.h"
 #include "comments-class-typedefs.h"
 #include "comments-file-variant1.h"
 #include "comments-file-variant2.h"
 #include "comments-file-variant3.h"
 #include "comments-class.h"