diff --git a/test/annote.wrap.cxx b/test/annote.wrap.cxx
index ee21607..9df6321 100644
--- a/test/annote.wrap.cxx
+++ b/test/annote.wrap.cxx
@@ -31,7 +31,7 @@ template <> constexpr bool c2py::is_wrapped<A> = true;
 
 template <> inline const std::string c2py::cpp_name<A>   = "A";
 template <> inline constexpr auto c2py::tp_name<A>       = "annote.A";
-template <> inline constexpr const char *c2py::tp_doc<A> = R"DOC(   * k: int = 12)DOC";
+template <> inline constexpr const char *c2py::tp_doc<A> = R"DOC(   )DOC";
 
 static int synth_constructor_0(PyObject *self, PyObject *args, PyObject *kwargs) {
   if (args and PyTuple_Check(args) and (PyTuple_Size(args) > 0)) {
@@ -46,7 +46,7 @@ static int synth_constructor_0(PyObject *self, PyObject *args, PyObject *kwargs)
     return -1;
   }
   auto &self_c = *(((c2py::wrap<A> *)self)->_c);
-  de("k", self_c.k, true);
+
   return de.check();
 }
 
@@ -59,7 +59,6 @@ PyMethodDef c2py::tp_methods<A>[] = {
    {nullptr, nullptr, 0, nullptr} // Sentinel
 };
 
-constexpr auto doc_member_0 = R"DOC()DOC";
 static PyObject *prop_get_dict_0(PyObject *self, void *) {
   auto &self_c = *(((c2py::wrap<A> *)self)->_c);
   c2py::pydict dic;
@@ -70,9 +69,10 @@ static PyObject *prop_get_dict_0(PyObject *self, void *) {
 // ----- Method table ----
 
 template <>
-constinit PyGetSetDef c2py::tp_getset<A>[] = {c2py::getsetdef_from_member<&A::k, A>("k", doc_member_0),
-                                              {"__dict__", (getter)prop_get_dict_0, nullptr, "", nullptr},
-                                              {nullptr, nullptr, nullptr, nullptr, nullptr}};
+constinit PyGetSetDef c2py::tp_getset<A>[] = {
+
+   {"__dict__", (getter)prop_get_dict_0, nullptr, "", nullptr},
+   {nullptr, nullptr, nullptr, nullptr, nullptr}};
 
 // ==================== module functions ====================
 
@@ -105,7 +105,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_annote() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("annote")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/basicfun.wrap.cxx b/test/basicfun.wrap.cxx
index 766860b..ea62469 100644
--- a/test/basicfun.wrap.cxx
+++ b/test/basicfun.wrap.cxx
@@ -112,7 +112,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_basicfun() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("basicfun")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/callables.wrap.cxx b/test/callables.wrap.cxx
index fff0514..bf18493 100644
--- a/test/callables.wrap.cxx
+++ b/test/callables.wrap.cxx
@@ -95,7 +95,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_callables() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("callables")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/callback.wrap.cxx b/test/callback.wrap.cxx
index edefc9f..98cccd6 100644
--- a/test/callback.wrap.cxx
+++ b/test/callback.wrap.cxx
@@ -70,7 +70,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_callback() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("callback")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/cls_basic.wrap.cxx b/test/cls_basic.wrap.cxx
index ffbe429..d9a37d3 100644
--- a/test/cls_basic.wrap.cxx
+++ b/test/cls_basic.wrap.cxx
@@ -180,7 +180,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_cls_basic() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("cls_basic")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/cls_der.wrap.cxx b/test/cls_der.wrap.cxx
index ffed737..8585351 100644
--- a/test/cls_der.wrap.cxx
+++ b/test/cls_der.wrap.cxx
@@ -106,7 +106,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_cls_der() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("cls_der")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/comparison.wrap.cxx b/test/comparison.wrap.cxx
index 6d1a536..7204fa1 100644
--- a/test/comparison.wrap.cxx
+++ b/test/comparison.wrap.cxx
@@ -126,7 +126,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_comparison() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("comparison")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/enumcxx.wrap.cxx b/test/enumcxx.wrap.cxx
index 0447c70..5ac89f0 100644
--- a/test/enumcxx.wrap.cxx
+++ b/test/enumcxx.wrap.cxx
@@ -68,7 +68,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_enumcxx() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("enumcxx")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/generator.wrap.cxx b/test/generator.wrap.cxx
index 8e2a080..57ab450 100644
--- a/test/generator.wrap.cxx
+++ b/test/generator.wrap.cxx
@@ -60,7 +60,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_generator() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("generator")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/ignore.wrap.cxx b/test/ignore.wrap.cxx
index 12ce860..9a1a191 100644
--- a/test/ignore.wrap.cxx
+++ b/test/ignore.wrap.cxx
@@ -160,7 +160,7 @@ static PyMethodDef module_methods[] = {
 static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
                                         "ignore",          /* name of module */
                                         R"RAWDOC()RAWDOC", /* module documentation, may be NULL */
-                                        -1,                /* size of per-interpreter state of the module, or -1 if the module keeps state in global variables. */
+                                        -1, /* size of per-interpreter state of the module, or -1 if the module keeps state in global variables. */
                                         module_methods,
                                         NULL,
                                         NULL,
diff --git a/test/issue9.wrap.cxx b/test/issue9.wrap.cxx
index 9d80484..fce49e2 100644
--- a/test/issue9.wrap.cxx
+++ b/test/issue9.wrap.cxx
@@ -95,7 +95,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_issue9() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("issue9")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/itertool.wrap.cxx b/test/itertool.wrap.cxx
index a4e44ec..8c6c3a8 100644
--- a/test/itertool.wrap.cxx
+++ b/test/itertool.wrap.cxx
@@ -86,7 +86,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_itertool() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("itertool")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/pointer.wrap.cxx b/test/pointer.wrap.cxx
index aa6e8ec..d08cd3c 100644
--- a/test/pointer.wrap.cxx
+++ b/test/pointer.wrap.cxx
@@ -99,7 +99,7 @@ static PyMethodDef module_methods[] = {
 static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
                                         "pointer",         /* name of module */
                                         R"RAWDOC()RAWDOC", /* module documentation, may be NULL */
-                                        -1,                /* size of per-interpreter state of the module, or -1 if the module keeps state in global variables. */
+                                        -1, /* size of per-interpreter state of the module, or -1 if the module keeps state in global variables. */
                                         module_methods,
                                         NULL,
                                         NULL,
diff --git a/test/synth_init.wrap.cxx b/test/synth_init.wrap.cxx
index 90af333..29c3c87 100644
--- a/test/synth_init.wrap.cxx
+++ b/test/synth_init.wrap.cxx
@@ -229,7 +229,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_synth_init() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("synth_init")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/tpl_cls.wrap.cxx b/test/tpl_cls.wrap.cxx
index 5d44cd4..ca33cde 100644
--- a/test/tpl_cls.wrap.cxx
+++ b/test/tpl_cls.wrap.cxx
@@ -95,7 +95,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_tpl_cls() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("tpl_cls")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/tpl_derived.wrap.cxx b/test/tpl_derived.wrap.cxx
index d8948fd..30b30dd 100644
--- a/test/tpl_derived.wrap.cxx
+++ b/test/tpl_derived.wrap.cxx
@@ -106,7 +106,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_tpl_derived() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("tpl_derived")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/two_module_1.wrap.cxx b/test/two_module_1.wrap.cxx
index 2a88733..98b3b18 100644
--- a/test/two_module_1.wrap.cxx
+++ b/test/two_module_1.wrap.cxx
@@ -109,7 +109,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_two_module_1() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("two_module_1")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H
diff --git a/test/two_module_2.wrap.cxx b/test/two_module_2.wrap.cxx
index 903aa69..1dad998 100644
--- a/test/two_module_2.wrap.cxx
+++ b/test/two_module_2.wrap.cxx
@@ -79,7 +79,7 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
 
 extern "C" __attribute__((visibility("default"))) PyObject *PyInit_two_module_2() {
 
-  if (not c2py::check_python_version()) return NULL;
+  if (not c2py::check_python_version("two_module_2")) return NULL;
 
     // import numpy iff 'numpy/arrayobject.h' included
 #ifdef Py_ARRAYOBJECT_H