From c153183894e9999ece2853811f9dbf35d677b96b Mon Sep 17 00:00:00 2001
From: rowanc1 <rowan@visiblegeology.com>
Date: Sun, 18 May 2014 16:46:25 -0700
Subject: [PATCH] map and model updates

---
 SimPEG/Models.py          | 3 ---
 SimPEG/Tests/test_maps.py | 9 ++++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/SimPEG/Models.py b/SimPEG/Models.py
index 583653be..f69b749c 100644
--- a/SimPEG/Models.py
+++ b/SimPEG/Models.py
@@ -33,6 +33,3 @@ class Model(np.ndarray):
         if getattr(self, '_transformDeriv', None) is None:
             self.deriv = self.mapping.deriv(self.view(np.ndarray))
         return self.deriv
-
-    def test(self, **kwargs):
-        return self.mapping.test(self.view(np.ndarray),**kwargs)
diff --git a/SimPEG/Tests/test_maps.py b/SimPEG/Tests/test_maps.py
index 04623fd6..986fa500 100644
--- a/SimPEG/Tests/test_maps.py
+++ b/SimPEG/Tests/test_maps.py
@@ -47,8 +47,6 @@ class MapTests(unittest.TestCase):
         # plt.show()
         self.assertLess(np.linalg.norm(mod.transform-t_true,np.inf),TOL)
 
-        self.assertTrue(mod.test(plotIt=False))
-
         self.assertRaises(Exception,Models.Model,np.r_[1.0],mapping=combo)
 
         self.assertRaises(ValueError, lambda: combo * (vertMap * expMap))
@@ -66,13 +64,14 @@ class MapTests(unittest.TestCase):
         expMap = Maps.ExpMap(M)
         actMap = Maps.ActiveCells(M, M.vectorCCy <=0, 10, nC=M.nCy)
         vertMap = Maps.Vertical1DMap(M)
-        mod = Models.Model(np.r_[1,2.],vertMap * actMap)
+        combo = vertMap * actMap
+        m = np.r_[1,2.]
+        mod = Models.Model(m,combo)
         # import matplotlib.pyplot as plt
         # plt.colorbar(M.plotImage(mod.transform)[0])
         # plt.show()
         self.assertLess(np.linalg.norm(mod.transform - np.r_[1,1,2,2,10,10,10,10.]), TOL)
-        self.assertTrue(mod.test())
-
+        self.assertLess((mod.transformDeriv - combo.deriv(m)).toarray().sum(), TOL)
 
     def test_tripleMultiply(self):
         M = Mesh.TensorMesh([2,4],'0C')