diff --git a/Examples/test-suite/python/autodoc_runme.py b/Examples/test-suite/python/autodoc_runme.py
index c65ebba24..dc843ae96 100644
--- a/Examples/test-suite/python/autodoc_runme.py
+++ b/Examples/test-suite/python/autodoc_runme.py
@@ -2,7 +2,7 @@ from autodoc import *
 
 def check(got, expected):
   if expected != got:
-    raise RuntimeError("\n" + "Expected: [" + expected + "]\n" + "Got     : [" + got + "]")
+    raise RuntimeError("\n" + "Expected: [" + str(expected) + "]\n" + "Got     : [" + str(got) + "]")
 
 check(A.__doc__, "Proxy of C++ A class")
 check(A.funk.__doc__, "just a string")
diff --git a/Examples/test-suite/template_typedef_class_template.i b/Examples/test-suite/template_typedef_class_template.i
index 498f83ec5..fc8151ff0 100644
--- a/Examples/test-suite/template_typedef_class_template.i
+++ b/Examples/test-suite/template_typedef_class_template.i
@@ -24,8 +24,8 @@ template<class Key, class T> class Multimap {
     class const_iterator {};
 
     // test usage of a typedef of a nested class in a template
-    Standard::Pair<iterator,iterator> equal_range_1(const key_type& kt1) {}
-    Standard::Pair<const_iterator,const_iterator> equal_range_2(const key_type& kt2) const {}
+    Standard::Pair<iterator,iterator> equal_range_1(const key_type& kt1) { return Standard::Pair<iterator,iterator>(); }
+    Standard::Pair<const_iterator,const_iterator> equal_range_2(const key_type& kt2) const { return Standard::Pair<const_iterator,const_iterator>(); }
   };
 }
 %}
diff --git a/Examples/test-suite/template_typemaps.i b/Examples/test-suite/template_typemaps.i
index deaf8351a..c68eba730 100644
--- a/Examples/test-suite/template_typemaps.i
+++ b/Examples/test-suite/template_typemaps.i
@@ -3,6 +3,7 @@
 
 %typemap(in) Integer1 
 {
+  $1 = 0;
   /* do nothing */
 }
 
@@ -13,6 +14,7 @@
 
 %typemap(in) Integer2 
 {
+  $1 = 0;
   /* do nothing */
 }
 
diff --git a/Examples/test-suite/typedef_struct.i b/Examples/test-suite/typedef_struct.i
index 4380156d1..97456d9a6 100644
--- a/Examples/test-suite/typedef_struct.i
+++ b/Examples/test-suite/typedef_struct.i
@@ -45,10 +45,18 @@ B_t make_b() {
 
 %inline %{
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _Foo {
   enum { NONAME1, NONAME2 } enumvar;
   int foovar;
   void (*fptr)(int);
 } Foo;
 
+#ifdef __cplusplus
+}
+#endif
+
 %}
diff --git a/Examples/test-suite/typemap_various.i b/Examples/test-suite/typemap_various.i
index 58dbe6667..5fc9fbcc2 100644
--- a/Examples/test-suite/typemap_various.i
+++ b/Examples/test-suite/typemap_various.i
@@ -65,10 +65,10 @@ void foo2(Foo<short> f, const Foo<short>& ff) {}
 %typemap(out) double ABC::_3   "$1 = 0.0;"
 %inline %{
 struct ABC {
-  double meth() {}
-  double m1() {}
-  double _x2() {}
-  double y_() {}
-  double _3() {}
+  double meth() { return 0.0; }
+  double m1() { return 0.0; }
+  double _x2() { return 0.0; }
+  double y_() { return 0.0; }
+  double _3() { return 0.0; }
 };
 %}