diff --git a/Examples/test-suite/python/lib_std_pair.i b/Examples/test-suite/python/lib_std_pair.i
index b93af5f64..c3ad8ae96 100644
--- a/Examples/test-suite/python/lib_std_pair.i
+++ b/Examples/test-suite/python/lib_std_pair.i
@@ -21,6 +21,7 @@
 %}
 
 namespace std {
+  %template(CIntPair) pair<const int, const int>;
   %template() pair<double, double>;
   %template(String) basic_string<char>;
   %template(IntPair) pair<int, int>;
@@ -29,6 +30,8 @@ namespace std {
   %template(SIIPair) pair<std::pair<std::string, int>, int>;
   %template(AIntPair) pair<A, int>;
 
+  %template(CCIntPair) pair<const A, const pair<int, int> >;
+
   %template(ABPair) pair<A, B>;
   %template(IntAPair) pair<int, A>;
 }
diff --git a/Examples/test-suite/python/lib_std_pair_runme.py b/Examples/test-suite/python/lib_std_pair_runme.py
new file mode 100644
index 000000000..fac19df11
--- /dev/null
+++ b/Examples/test-suite/python/lib_std_pair_runme.py
@@ -0,0 +1,40 @@
+import lib_std_pair
+
+p = (1,2)
+p1 = lib_std_pair.p_inout(p)
+p2 = lib_std_pair.p_inoutd(p1)
+
+d1 = lib_std_pair.d_inout(2)
+
+i,d2 = lib_std_pair.d_inout2(2)
+
+i,p = lib_std_pair.p_inout2(p)
+p3,p4 = lib_std_pair.p_inout3(p1,p1)
+
+psi = lib_std_pair.SIPair("hello",1)
+pci = lib_std_pair.CIPair(1,1)
+
+
+psi.first = "hi"
+
+
+psi = lib_std_pair.SIPair("hi",1)
+if psi != ("hi",1):
+  raise RuntimeError
+
+psii = lib_std_pair.SIIPair(psi,1)
+
+a = lib_std_pair.A()
+b = lib_std_pair.B()
+
+pab = lib_std_pair.ABPair(a,b);
+
+pab.first = a
+pab.first.val = 2
+
+if pab.first.val != 2:
+  raise RuntimeError
+  
+
+pci = lib_std_pair.CIntPair(1,0)
+
diff --git a/Examples/test-suite/python/std_containers.i b/Examples/test-suite/python/std_containers.i
index 8f9380f95..6975b2190 100644
--- a/Examples/test-suite/python/std_containers.i
+++ b/Examples/test-suite/python/std_containers.i
@@ -30,7 +30,7 @@
   {
     return c;
   }
-  
+
 }
 
 
@@ -162,5 +162,19 @@ template <class C> struct Param
     return a;
   }  
 
+  struct Foo
+  {
+    Foo(int i) {
+    }
+  };
+  
 }
 
+
+%std_nodefconst_type(Foo);
+
+%template(vector_Foo) std::vector<Foo>;
+%template(deque_Foo) std::deque<Foo>;
+%template(list_Foo) std::list<Foo>;
+
+