diff --git a/wrap/tests/expected/@Point2/Point2.m b/wrap/tests/expected/@Point2/Point2.m
index 31d54bb19..5cfd7fc61 100644
--- a/wrap/tests/expected/@Point2/Point2.m
+++ b/wrap/tests/expected/@Point2/Point2.m
@@ -7,12 +7,12 @@ classdef Point2 < handle
     function obj = Point2(varargin)
       if (nargin == 0), obj.self = new_Point2(0,0); end
       if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Point2(0,1,varargin{1},varargin{2}); end
-      if nargin ==14, new_Point2_(varargin{1},0); end
+      if nargin ==14, new_Point2(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Point2 constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_Point2_(obj.self);
+        new_Point2(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected/@Point3/Point3.m b/wrap/tests/expected/@Point3/Point3.m
index 6dd8e9ee5..81bd00a5a 100644
--- a/wrap/tests/expected/@Point3/Point3.m
+++ b/wrap/tests/expected/@Point3/Point3.m
@@ -6,12 +6,12 @@ classdef Point3 < handle
   methods
     function obj = Point3(varargin)
       if (nargin == 3 && isa(varargin{1},'double') && isa(varargin{2},'double') && isa(varargin{3},'double')), obj.self = new_Point3(0,0,varargin{1},varargin{2},varargin{3}); end
-      if nargin ==14, new_Point3_(varargin{1},0); end
+      if nargin ==14, new_Point3(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Point3 constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_Point3_(obj.self);
+        new_Point3(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected/@Test/Test.m b/wrap/tests/expected/@Test/Test.m
index 60628b997..63914d2aa 100644
--- a/wrap/tests/expected/@Test/Test.m
+++ b/wrap/tests/expected/@Test/Test.m
@@ -7,12 +7,12 @@ classdef Test < handle
     function obj = Test(varargin)
       if (nargin == 0), obj.self = new_Test(0,0); end
       if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Test(0,1,varargin{1},varargin{2}); end
-      if nargin ==14, new_Test_(varargin{1},0); end
+      if nargin ==14, new_Test(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Test constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_Test_(obj.self);
+        new_Test(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected/new_Point2.cpp b/wrap/tests/expected/new_Point2.cpp
index 30a707f88..b24642ad4 100644
--- a/wrap/tests/expected/new_Point2.cpp
+++ b/wrap/tests/expected/new_Point2.cpp
@@ -6,8 +6,10 @@ typedef boost::shared_ptr<Point2> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected/new_Point3.cpp b/wrap/tests/expected/new_Point3.cpp
index c3d758266..2e715263b 100644
--- a/wrap/tests/expected/new_Point3.cpp
+++ b/wrap/tests/expected/new_Point3.cpp
@@ -7,8 +7,10 @@ typedef boost::shared_ptr<Point3> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected/new_Test.cpp b/wrap/tests/expected/new_Test.cpp
index 050d179d3..57ac1a4ea 100644
--- a/wrap/tests/expected/new_Test.cpp
+++ b/wrap/tests/expected/new_Test.cpp
@@ -7,8 +7,10 @@ typedef boost::shared_ptr<Test> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected_namespaces/@ClassD/ClassD.m b/wrap/tests/expected_namespaces/@ClassD/ClassD.m
index 282b761ed..90fbf48a4 100644
--- a/wrap/tests/expected_namespaces/@ClassD/ClassD.m
+++ b/wrap/tests/expected_namespaces/@ClassD/ClassD.m
@@ -6,12 +6,12 @@ classdef ClassD < handle
   methods
     function obj = ClassD(varargin)
       if (nargin == 0), obj.self = new_ClassD(0,0); end
-      if nargin ==14, new_ClassD_(varargin{1},0); end
+      if nargin ==14, new_ClassD(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ClassD constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_ClassD_(obj.self);
+        new_ClassD(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected_namespaces/@ns1ClassA/ns1ClassA.m b/wrap/tests/expected_namespaces/@ns1ClassA/ns1ClassA.m
index b8f1b3535..727e020ae 100644
--- a/wrap/tests/expected_namespaces/@ns1ClassA/ns1ClassA.m
+++ b/wrap/tests/expected_namespaces/@ns1ClassA/ns1ClassA.m
@@ -6,12 +6,12 @@ classdef ns1ClassA < handle
   methods
     function obj = ns1ClassA(varargin)
       if (nargin == 0), obj.self = new_ns1ClassA(0,0); end
-      if nargin ==14, new_ns1ClassA_(varargin{1},0); end
+      if nargin ==14, new_ns1ClassA(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassA constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_ns1ClassA_(obj.self);
+        new_ns1ClassA(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected_namespaces/@ns1ClassB/ns1ClassB.m b/wrap/tests/expected_namespaces/@ns1ClassB/ns1ClassB.m
index 42add5e9c..19b0a73b9 100644
--- a/wrap/tests/expected_namespaces/@ns1ClassB/ns1ClassB.m
+++ b/wrap/tests/expected_namespaces/@ns1ClassB/ns1ClassB.m
@@ -6,12 +6,12 @@ classdef ns1ClassB < handle
   methods
     function obj = ns1ClassB(varargin)
       if (nargin == 0), obj.self = new_ns1ClassB(0,0); end
-      if nargin ==14, new_ns1ClassB_(varargin{1},0); end
+      if nargin ==14, new_ns1ClassB(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassB constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_ns1ClassB_(obj.self);
+        new_ns1ClassB(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected_namespaces/@ns2ClassA/ns2ClassA.m b/wrap/tests/expected_namespaces/@ns2ClassA/ns2ClassA.m
index cbbbbbce2..27de74dc3 100644
--- a/wrap/tests/expected_namespaces/@ns2ClassA/ns2ClassA.m
+++ b/wrap/tests/expected_namespaces/@ns2ClassA/ns2ClassA.m
@@ -6,12 +6,12 @@ classdef ns2ClassA < handle
   methods
     function obj = ns2ClassA(varargin)
       if (nargin == 0), obj.self = new_ns2ClassA(0,0); end
-      if nargin ==14, new_ns2ClassA_(varargin{1},0); end
+      if nargin ==14, new_ns2ClassA(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassA constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_ns2ClassA_(obj.self);
+        new_ns2ClassA(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected_namespaces/@ns2ClassC/ns2ClassC.m b/wrap/tests/expected_namespaces/@ns2ClassC/ns2ClassC.m
index 5bd68fee7..2425b59bd 100644
--- a/wrap/tests/expected_namespaces/@ns2ClassC/ns2ClassC.m
+++ b/wrap/tests/expected_namespaces/@ns2ClassC/ns2ClassC.m
@@ -6,12 +6,12 @@ classdef ns2ClassC < handle
   methods
     function obj = ns2ClassC(varargin)
       if (nargin == 0), obj.self = new_ns2ClassC(0,0); end
-      if nargin ==14, new_ns2ClassC_(varargin{1},0); end
+      if nargin ==14, new_ns2ClassC(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassC constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_ns2ClassC_(obj.self);
+        new_ns2ClassC(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected_namespaces/@ns2ns3ClassB/ns2ns3ClassB.m b/wrap/tests/expected_namespaces/@ns2ns3ClassB/ns2ns3ClassB.m
index 936c7cdd1..de7f7a3ca 100644
--- a/wrap/tests/expected_namespaces/@ns2ns3ClassB/ns2ns3ClassB.m
+++ b/wrap/tests/expected_namespaces/@ns2ns3ClassB/ns2ns3ClassB.m
@@ -6,12 +6,12 @@ classdef ns2ns3ClassB < handle
   methods
     function obj = ns2ns3ClassB(varargin)
       if (nargin == 0), obj.self = new_ns2ns3ClassB(0,0); end
-      if nargin ==14, new_ns2ns3ClassB_(varargin{1},0); end
+      if nargin ==14, new_ns2ns3ClassB(varargin{1},0); end
       if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ns3ClassB constructor failed'); end
     end
     function delete(obj)
       if obj.self ~= 0
-        new_ns2ns3ClassB_(obj.self);
+        new_ns2ns3ClassB(obj.self);
         obj.self = 0;
       end
     end
diff --git a/wrap/tests/expected_namespaces/new_ClassD.cpp b/wrap/tests/expected_namespaces/new_ClassD.cpp
index 13bbe9d5e..d7a7e4908 100644
--- a/wrap/tests/expected_namespaces/new_ClassD.cpp
+++ b/wrap/tests/expected_namespaces/new_ClassD.cpp
@@ -6,8 +6,10 @@ typedef boost::shared_ptr<ClassD> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected_namespaces/new_ns1ClassA.cpp b/wrap/tests/expected_namespaces/new_ns1ClassA.cpp
index fc60abe6d..2554eafc1 100644
--- a/wrap/tests/expected_namespaces/new_ns1ClassA.cpp
+++ b/wrap/tests/expected_namespaces/new_ns1ClassA.cpp
@@ -6,8 +6,10 @@ typedef boost::shared_ptr<ns1::ClassA> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected_namespaces/new_ns1ClassB.cpp b/wrap/tests/expected_namespaces/new_ns1ClassB.cpp
index 419453968..bc1dd313c 100644
--- a/wrap/tests/expected_namespaces/new_ns1ClassB.cpp
+++ b/wrap/tests/expected_namespaces/new_ns1ClassB.cpp
@@ -7,8 +7,10 @@ typedef boost::shared_ptr<ns1::ClassB> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected_namespaces/new_ns2ClassA.cpp b/wrap/tests/expected_namespaces/new_ns2ClassA.cpp
index 31e3385d5..57faabc79 100644
--- a/wrap/tests/expected_namespaces/new_ns2ClassA.cpp
+++ b/wrap/tests/expected_namespaces/new_ns2ClassA.cpp
@@ -7,8 +7,10 @@ typedef boost::shared_ptr<ns2::ClassA> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected_namespaces/new_ns2ClassC.cpp b/wrap/tests/expected_namespaces/new_ns2ClassC.cpp
index c0446109a..e836a80fd 100644
--- a/wrap/tests/expected_namespaces/new_ns2ClassC.cpp
+++ b/wrap/tests/expected_namespaces/new_ns2ClassC.cpp
@@ -6,8 +6,10 @@ typedef boost::shared_ptr<ns2::ClassC> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
diff --git a/wrap/tests/expected_namespaces/new_ns2ns3ClassB.cpp b/wrap/tests/expected_namespaces/new_ns2ns3ClassB.cpp
index a952790b5..af1a25922 100644
--- a/wrap/tests/expected_namespaces/new_ns2ns3ClassB.cpp
+++ b/wrap/tests/expected_namespaces/new_ns2ns3ClassB.cpp
@@ -7,8 +7,10 @@ typedef boost::shared_ptr<ns2::ns3::ClassB> Shared;
 static std::set<Shared*> collector;
 
 void cleanup(void) {
-  BOOST_FOREACH(Shared* p, collector)
-    collector.erase(p);
+  for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
+    delete *iter;
+    collector.erase(iter++);
+  }
 }
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {