From 8bf7a4c187cd4613d8a483c422b82e9db2fac2eb Mon Sep 17 00:00:00 2001
From: Greg Landrum <greg.landrum@gmail.com>
Date: Tue, 3 Feb 2009 05:26:10 +0000
Subject: [PATCH] now all tests pass here as well

---
 Code/ChemicalFeatures/Wrap/testData/feat.pkl       |  2 +-
 Code/ChemicalFeatures/Wrap/testFeatures.py         |  8 ++++----
 Code/ChemicalFeatures/Wrap/test_list.py            |  2 +-
 Code/ChemicalFeatures/test_list.py                 |  2 +-
 .../MetricMatrixCalc/Wrap/testMatricCalc.py        |  6 +++---
 Code/DataManip/MetricMatrixCalc/Wrap/test_list.py  |  2 +-
 Code/DataManip/MetricMatrixCalc/test_list.py       |  2 +-
 Code/DataStructs/Wrap/testBV.py                    |  4 ++--
 Code/DataStructs/Wrap/testData/dvvs.pkl            | 10 +++++-----
 Code/DataStructs/Wrap/testData/isiv.pkl            |  2 +-
 Code/DataStructs/Wrap/testData/lsiv.pkl            |  2 +-
 Code/DataStructs/Wrap/testDiscreteValueVect.py     |  4 ++--
 Code/DataStructs/Wrap/testSparseIntVect.py         |  4 ++--
 Code/DataStructs/Wrap/test_list.py                 |  2 +-
 Code/DataStructs/test_list.py                      |  5 +++++
 Code/Demos/SWIG/java_example/test_list.py          |  2 +-
 Code/DistGeom/Wrap/rough_test.py                   |  4 ++--
 Code/DistGeom/Wrap/test_list.py                    |  2 +-
 Code/DistGeom/test_list.py                         |  2 +-
 Code/Features/test_list.py                         |  2 +-
 Code/ForceField/test_list.py                       |  2 +-
 Code/Geometry/Wrap/testGeometry.py                 |  6 +++---
 Code/Geometry/Wrap/test_list.py                    |  2 +-
 Code/Geometry/test_list.py                         |  2 +-
 .../ChemReactions/Wrap/testReactionWrapper.py      | 10 +++++-----
 Code/GraphMol/ChemReactions/Wrap/test_list.py      |  2 +-
 Code/GraphMol/ChemReactions/test_list.py           |  2 +-
 Code/GraphMol/ChemTransforms/test_list.py          |  2 +-
 Code/GraphMol/Depictor/Wrap/testDepictor.py        | 10 +++++-----
 Code/GraphMol/Depictor/Wrap/test_list.py           |  2 +-
 Code/GraphMol/Depictor/test_list.py                |  2 +-
 .../Descriptors/Wrap/testMolDescriptors.py         |  8 ++++----
 Code/GraphMol/Descriptors/test_list.py             |  2 +-
 Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py | 10 +++++-----
 Code/GraphMol/DistGeomHelpers/Wrap/test_list.py    |  2 +-
 Code/GraphMol/DistGeomHelpers/test_list.py         |  2 +-
 Code/GraphMol/FileParsers/test_list.py             |  2 +-
 Code/GraphMol/Fingerprints/test_list.py            |  2 +-
 .../GraphMol/ForceFieldHelpers/Wrap/testHelpers.py |  6 +++---
 Code/GraphMol/ForceFieldHelpers/test_list.py       |  2 +-
 Code/GraphMol/FragCatalog/Wrap/rough_test.py       | 10 +++++-----
 Code/GraphMol/FragCatalog/Wrap/test_list.py        |  2 +-
 Code/GraphMol/FragCatalog/test_list.py             |  2 +-
 Code/GraphMol/MolAlign/Wrap/testMolAlign.py        |  6 +++---
 Code/GraphMol/MolAlign/Wrap/test_list.py           |  2 +-
 Code/GraphMol/MolAlign/test_list.py                |  2 +-
 Code/GraphMol/MolCatalog/Wrap/rough_test.py        |  8 ++++----
 Code/GraphMol/MolCatalog/Wrap/test_list.py         |  2 +-
 Code/GraphMol/MolCatalog/test_list.py              |  2 +-
 .../Wrap/testChemicalFeatures.py                   |  8 ++++----
 .../GraphMol/MolChemicalFeatures/Wrap/test_list.py |  2 +-
 Code/GraphMol/MolChemicalFeatures/test_list.py     |  2 +-
 .../MolTransforms/Wrap/testMolTransforms.py        | 10 +++++-----
 Code/GraphMol/MolTransforms/Wrap/test_list.py      |  2 +-
 Code/GraphMol/MolTransforms/test_list.py           |  2 +-
 .../PartialCharges/Wrap/testPartialCharges.py      |  6 +++---
 Code/GraphMol/PartialCharges/Wrap/test_list.py     |  2 +-
 Code/GraphMol/SLNParse/Wrap/testSLN.py             |  8 ++++----
 Code/GraphMol/SLNParse/Wrap/test_list.py           |  2 +-
 Code/GraphMol/SLNParse/test_list.py                |  2 +-
 .../GraphMol/ShapeHelpers/Wrap/testShapeHelpers.py | 14 +++++++-------
 Code/GraphMol/ShapeHelpers/Wrap/test_list.py       |  2 +-
 Code/GraphMol/ShapeHelpers/test_list.py            |  2 +-
 Code/GraphMol/SmilesParse/test_list.py             |  2 +-
 Code/GraphMol/Subgraphs/test_list.py               |  2 +-
 Code/GraphMol/Substruct/test_list.py               |  2 +-
 Code/GraphMol/UnitTestQueryMol.py                  |  2 +-
 Code/GraphMol/Wrap/rough_test.py                   | 10 +++++-----
 Code/GraphMol/Wrap/testConformer.py                |  6 +++---
 Code/GraphMol/Wrap/test_list.py                    |  2 +-
 Code/GraphMol/test_list.py                         |  2 +-
 Code/ML/FeatureSelect/Wrap/testCMIM.py             |  6 +++---
 Code/ML/FeatureSelect/Wrap/test_list.py            |  6 ++++++
 Code/ML/InfoTheory/Wrap/testData/Issue237.pkl      |  2 +-
 Code/ML/InfoTheory/Wrap/testRanker.py              |  6 +++---
 Code/ML/InfoTheory/Wrap/test_list.py               |  6 ++++++
 Code/ML/test_list.py                               |  2 +-
 Code/Numerics/Alignment/Wrap/testAlignment.py      |  6 +++---
 Code/Numerics/Alignment/Wrap/test_list.py          |  2 +-
 Code/Numerics/Alignment/test_list.py               |  2 +-
 Code/Numerics/EigenSolvers/test_list.py            |  2 +-
 Code/Numerics/Optimizer/test_list.py               |  2 +-
 Code/Numerics/test_list.py                         |  2 +-
 Code/Query/test_list.py                            |  2 +-
 Code/RDGeneral/test_list.py                        |  2 +-
 Code/SimDivPickers/Wrap/testMaxMin.py              |  4 ++--
 Code/SimDivPickers/Wrap/testPickers.py             |  8 ++++----
 Code/SimDivPickers/Wrap/test_list.py               |  6 ++++++
 Code/test_list.py                                  |  2 +-
 89 files changed, 183 insertions(+), 160 deletions(-)

diff --git a/Code/ChemicalFeatures/Wrap/testData/feat.pkl b/Code/ChemicalFeatures/Wrap/testData/feat.pkl
index 12cd7af7d..827ce2820 100644
--- a/Code/ChemicalFeatures/Wrap/testData/feat.pkl
+++ b/Code/ChemicalFeatures/Wrap/testData/feat.pkl
@@ -1,4 +1,4 @@
-cChem.rdChemicalFeatures
+crdkit.Chem.rdChemicalFeatures
 FreeChemicalFeature
 p1
 (S'\x10\x00\x00\x00\x0b\x00\x00\x00HBondDonor\x00\x0c\x00\x00\x00HBondDonor1\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x08@'
diff --git a/Code/ChemicalFeatures/Wrap/testFeatures.py b/Code/ChemicalFeatures/Wrap/testFeatures.py
index b9dfb0e15..4195404b1 100644
--- a/Code/ChemicalFeatures/Wrap/testFeatures.py
+++ b/Code/ChemicalFeatures/Wrap/testFeatures.py
@@ -4,13 +4,13 @@
 #
 #  @@ All Rights Reserved @@
 #
-import RDConfig
+from rdkit import RDConfig
 import os
-import Chem
-from Chem import ChemicalFeatures
+from rdkit import Chem
+from rdkit.Chem import ChemicalFeatures
 import unittest
 import cPickle
-from Geometry import rdGeometry as geom
+from rdkit.Geometry import rdGeometry as geom
 
 def feq(v1,v2,tol2=1e-4):
   return abs(v1-v2)<=tol2
diff --git a/Code/ChemicalFeatures/Wrap/test_list.py b/Code/ChemicalFeatures/Wrap/test_list.py
index c239c6e98..e3485eeb8 100644
--- a/Code/ChemicalFeatures/Wrap/test_list.py
+++ b/Code/ChemicalFeatures/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/ChemicalFeatures/test_list.py b/Code/ChemicalFeatures/test_list.py
index 522386e66..0189030b2 100644
--- a/Code/ChemicalFeatures/test_list.py
+++ b/Code/ChemicalFeatures/test_list.py
@@ -7,6 +7,6 @@ tests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/DataManip/MetricMatrixCalc/Wrap/testMatricCalc.py b/Code/DataManip/MetricMatrixCalc/Wrap/testMatricCalc.py
index b33c770be..6a369f973 100755
--- a/Code/DataManip/MetricMatrixCalc/Wrap/testMatricCalc.py
+++ b/Code/DataManip/MetricMatrixCalc/Wrap/testMatricCalc.py
@@ -1,9 +1,9 @@
-import RDConfig
+from rdkit import RDConfig
 import unittest
-from DataManip.Metric import rdMetricMatrixCalc as rdmmc
+from rdkit.DataManip.Metric import rdMetricMatrixCalc as rdmmc
 import numpy
 import random
-import DataStructs
+from rdkit import DataStructs
 
 def feq(v1,v2,tol2=1e-4):
     return abs(v1-v2)<=tol2
diff --git a/Code/DataManip/MetricMatrixCalc/Wrap/test_list.py b/Code/DataManip/MetricMatrixCalc/Wrap/test_list.py
index 45e882ea4..5ffdffe34 100755
--- a/Code/DataManip/MetricMatrixCalc/Wrap/test_list.py
+++ b/Code/DataManip/MetricMatrixCalc/Wrap/test_list.py
@@ -7,6 +7,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/DataManip/MetricMatrixCalc/test_list.py b/Code/DataManip/MetricMatrixCalc/test_list.py
index 2f439333a..d593c1e51 100755
--- a/Code/DataManip/MetricMatrixCalc/test_list.py
+++ b/Code/DataManip/MetricMatrixCalc/test_list.py
@@ -6,6 +6,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/DataStructs/Wrap/testBV.py b/Code/DataStructs/Wrap/testBV.py
index 8be4a2934..bc63c5fe7 100755
--- a/Code/DataStructs/Wrap/testBV.py
+++ b/Code/DataStructs/Wrap/testBV.py
@@ -1,5 +1,5 @@
-import DataStructs
-import RDConfig
+from rdkit import DataStructs
+from rdkit import RDConfig
 import unittest
 import cPickle as pickle
 import random
diff --git a/Code/DataStructs/Wrap/testData/dvvs.pkl b/Code/DataStructs/Wrap/testData/dvvs.pkl
index 7f6bb32d3..68de75800 100644
--- a/Code/DataStructs/Wrap/testData/dvvs.pkl
+++ b/Code/DataStructs/Wrap/testData/dvvs.pkl
@@ -1,24 +1,24 @@
-cDataStructs.cDataStructs
+crdkit.DataStructs.cDataStructs
 DiscreteValueVect
 p1
 (S'\xff\xff\xff\xff\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x1e\x00\x00\x00\x01\x00\x00\x00UUU\x15'
 tRp2
-.cDataStructs.cDataStructs
+.crdkit.DataStructs.cDataStructs
 DiscreteValueVect
 p1
 (S'\xff\xff\xff\xff\x01\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x1e\x00\x00\x00\x02\x00\x00\x00\xe4\xe4\xe4\xe4\xe4\xe4\xe4\x04'
 tRp2
-.cDataStructs.cDataStructs
+.crdkit.DataStructs.cDataStructs
 DiscreteValueVect
 p1
 (S'\xff\xff\xff\xff\x02\x00\x00\x00\x04\x00\x00\x00\x0f\x00\x00\x00\x10\x00\x00\x00\x02\x00\x00\x00\x102Tv\x98\xba\xdc\xfe'
 tRp2
-.cDataStructs.cDataStructs
+.crdkit.DataStructs.cDataStructs
 DiscreteValueVect
 p1
 (S'\xff\xff\xff\xff\x03\x00\x00\x00\x08\x00\x00\x00\xff\x00\x00\x00\x05\x00\x00\x00\x02\x00\x00\x00"\xa7\x038\x80\x00\x00\x00'
 tRp2
-.cDataStructs.cDataStructs
+.crdkit.DataStructs.cDataStructs
 DiscreteValueVect
 p1
 (S'\xff\xff\xff\xff\x04\x00\x00\x00\x10\x00\x00\x00\xff\xff\x00\x00\x03\x00\x00\x00\x02\x00\x00\x00)\tB\xfc"\x00\x00\x00'
diff --git a/Code/DataStructs/Wrap/testData/isiv.pkl b/Code/DataStructs/Wrap/testData/isiv.pkl
index ebbf6158c..44b4f1fdf 100644
--- a/Code/DataStructs/Wrap/testData/isiv.pkl
+++ b/Code/DataStructs/Wrap/testData/isiv.pkl
@@ -1,4 +1,4 @@
-cDataStructs.cDataStructs
+crdkit.DataStructs.cDataStructs
 IntSparseIntVect
 p1
 (S'\x01\x00\x00\x00\x04\x00\x00\x00\x00\x00 \x00\x03\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x00\x10\x00\x00\x03\x00\x00\x00'
diff --git a/Code/DataStructs/Wrap/testData/lsiv.pkl b/Code/DataStructs/Wrap/testData/lsiv.pkl
index abbea7982..99716690a 100644
--- a/Code/DataStructs/Wrap/testData/lsiv.pkl
+++ b/Code/DataStructs/Wrap/testData/lsiv.pkl
@@ -1,4 +1,4 @@
-cDataStructs.cDataStructs
+crdkit.DataStructs.cDataStructs
 LongSparseIntVect
 p1
 (S'\x01\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x03\x00\x00\x00'
diff --git a/Code/DataStructs/Wrap/testDiscreteValueVect.py b/Code/DataStructs/Wrap/testDiscreteValueVect.py
index cba2c7f62..9931e2bab 100644
--- a/Code/DataStructs/Wrap/testDiscreteValueVect.py
+++ b/Code/DataStructs/Wrap/testDiscreteValueVect.py
@@ -4,10 +4,10 @@
 #
 #  @@ All Rights Reserved @@
 #
-import RDConfig
+from rdkit import RDConfig
 import os,sys,cPickle
 import unittest
-import DataStructs as ds
+from rdkit import DataStructs as ds
 
 class TestCase(unittest.TestCase):
   def setUp(self) :
diff --git a/Code/DataStructs/Wrap/testSparseIntVect.py b/Code/DataStructs/Wrap/testSparseIntVect.py
index 2a3b9d7b1..cacf4b48f 100644
--- a/Code/DataStructs/Wrap/testSparseIntVect.py
+++ b/Code/DataStructs/Wrap/testSparseIntVect.py
@@ -4,10 +4,10 @@
 #
 #  @@ All Rights Reserved @@
 #
-import RDConfig
+from rdkit import RDConfig
 import os,sys,cPickle
 import unittest
-import DataStructs as ds
+from rdkit import DataStructs as ds
 
 def feq(v1,v2,tol=1e-4):
   return abs(v1-v2)<tol
diff --git a/Code/DataStructs/Wrap/test_list.py b/Code/DataStructs/Wrap/test_list.py
index 9ee059ee1..2b935a36d 100755
--- a/Code/DataStructs/Wrap/test_list.py
+++ b/Code/DataStructs/Wrap/test_list.py
@@ -10,7 +10,7 @@ tests=[
 longTests=[]
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
 
diff --git a/Code/DataStructs/test_list.py b/Code/DataStructs/test_list.py
index 7c23fa0f4..dfbe5150a 100755
--- a/Code/DataStructs/test_list.py
+++ b/Code/DataStructs/test_list.py
@@ -7,3 +7,8 @@ tests=[
 
 longTests=[]
 
+if __name__=='__main__':
+  import sys
+  from rdkit import TestRunner
+  failed,tests = TestRunner.RunScript('test_list.py',0,1)
+  sys.exit(len(failed))
diff --git a/Code/Demos/SWIG/java_example/test_list.py b/Code/Demos/SWIG/java_example/test_list.py
index 6ef02bd92..e10be6367 100644
--- a/Code/Demos/SWIG/java_example/test_list.py
+++ b/Code/Demos/SWIG/java_example/test_list.py
@@ -16,6 +16,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/DistGeom/Wrap/rough_test.py b/Code/DistGeom/Wrap/rough_test.py
index 685d83767..4a50b7a39 100644
--- a/Code/DistGeom/Wrap/rough_test.py
+++ b/Code/DistGeom/Wrap/rough_test.py
@@ -5,11 +5,11 @@
 #  Copyright (C) 2004  Rational Discovery LLC
 #         All Rights Reserved
 #
-import RDConfig
+from rdkit import RDConfig
 import os,sys
 import unittest
 import numpy.oldnumeric as Numeric
-import DistanceGeometry as DG
+from rdkit import DistanceGeometry as DG
 
 def feq(v1,v2,tol2=1e-4):
   return abs(v1-v2)<=tol2
diff --git a/Code/DistGeom/Wrap/test_list.py b/Code/DistGeom/Wrap/test_list.py
index 77c6dab1e..f3e6d0c76 100644
--- a/Code/DistGeom/Wrap/test_list.py
+++ b/Code/DistGeom/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/DistGeom/test_list.py b/Code/DistGeom/test_list.py
index 363d15b3e..9e42ae143 100755
--- a/Code/DistGeom/test_list.py
+++ b/Code/DistGeom/test_list.py
@@ -10,6 +10,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Features/test_list.py b/Code/Features/test_list.py
index 0ced4a61b..68876f0ed 100644
--- a/Code/Features/test_list.py
+++ b/Code/Features/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/ForceField/test_list.py b/Code/ForceField/test_list.py
index c8d115437..dff63ef2d 100755
--- a/Code/ForceField/test_list.py
+++ b/Code/ForceField/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Geometry/Wrap/testGeometry.py b/Code/Geometry/Wrap/testGeometry.py
index 026ffd1df..e68b165fa 100644
--- a/Code/Geometry/Wrap/testGeometry.py
+++ b/Code/Geometry/Wrap/testGeometry.py
@@ -1,8 +1,8 @@
-import RDConfig
+from rdkit import RDConfig
 import os,sys
 import unittest
-import DataStructs
-from Geometry import rdGeometry as geom
+from rdkit import DataStructs
+from rdkit.Geometry import rdGeometry as geom
 import cPickle,copy
 import math
 
diff --git a/Code/Geometry/Wrap/test_list.py b/Code/Geometry/Wrap/test_list.py
index 2a39ce23a..c295013d1 100644
--- a/Code/Geometry/Wrap/test_list.py
+++ b/Code/Geometry/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Geometry/test_list.py b/Code/Geometry/test_list.py
index 5bd2980bd..3a2e911d0 100644
--- a/Code/Geometry/test_list.py
+++ b/Code/Geometry/test_list.py
@@ -11,6 +11,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/ChemReactions/Wrap/testReactionWrapper.py b/Code/GraphMol/ChemReactions/Wrap/testReactionWrapper.py
index 05a28b886..c4b8821d5 100644
--- a/Code/GraphMol/ChemReactions/Wrap/testReactionWrapper.py
+++ b/Code/GraphMol/ChemReactions/Wrap/testReactionWrapper.py
@@ -29,11 +29,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-import rdBase
-import Chem
-from Chem import rdChemReactions
-import Geometry
-import RDConfig
+from rdkit import rdBase
+from rdkit import Chem
+from rdkit.Chem import rdChemReactions
+from rdkit import Geometry
+from rdkit import RDConfig
 import unittest
 import os,sys
 import cPickle as pickle
diff --git a/Code/GraphMol/ChemReactions/Wrap/test_list.py b/Code/GraphMol/ChemReactions/Wrap/test_list.py
index a9dd75b0b..6e8612d9b 100644
--- a/Code/GraphMol/ChemReactions/Wrap/test_list.py
+++ b/Code/GraphMol/ChemReactions/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/ChemReactions/test_list.py b/Code/GraphMol/ChemReactions/test_list.py
index a70589657..118533f53 100644
--- a/Code/GraphMol/ChemReactions/test_list.py
+++ b/Code/GraphMol/ChemReactions/test_list.py
@@ -10,6 +10,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/ChemTransforms/test_list.py b/Code/GraphMol/ChemTransforms/test_list.py
index fd93ffe07..cf8deb42f 100644
--- a/Code/GraphMol/ChemTransforms/test_list.py
+++ b/Code/GraphMol/ChemTransforms/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/Depictor/Wrap/testDepictor.py b/Code/GraphMol/Depictor/Wrap/testDepictor.py
index 188abb941..58b3ce99e 100755
--- a/Code/GraphMol/Depictor/Wrap/testDepictor.py
+++ b/Code/GraphMol/Depictor/Wrap/testDepictor.py
@@ -3,14 +3,14 @@
 #
 #  $Id$
 #
-import Chem
-from Chem import rdDepictor
-import Geometry
-import RDConfig
+from rdkit import Chem
+from rdkit.Chem import rdDepictor
+from rdkit import Geometry
+from rdkit import RDConfig
 import unittest
 import os,sys
 import cPickle as pickle
-from Chem.ChemUtils import AlignDepict
+from rdkit.Chem.ChemUtils import AlignDepict
 import numpy.oldnumeric as Numeric
 
 def feq(v1,v2,tol2=1e-4):
diff --git a/Code/GraphMol/Depictor/Wrap/test_list.py b/Code/GraphMol/Depictor/Wrap/test_list.py
index 2e48b5a3c..1c40986bb 100755
--- a/Code/GraphMol/Depictor/Wrap/test_list.py
+++ b/Code/GraphMol/Depictor/Wrap/test_list.py
@@ -8,6 +8,6 @@ longTests = []
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/Depictor/test_list.py b/Code/GraphMol/Depictor/test_list.py
index 926017bfe..baf3f6626 100755
--- a/Code/GraphMol/Depictor/test_list.py
+++ b/Code/GraphMol/Depictor/test_list.py
@@ -7,6 +7,6 @@ longTests = []
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/Descriptors/Wrap/testMolDescriptors.py b/Code/GraphMol/Descriptors/Wrap/testMolDescriptors.py
index ce38855f6..ae7fac0b8 100644
--- a/Code/GraphMol/Descriptors/Wrap/testMolDescriptors.py
+++ b/Code/GraphMol/Descriptors/Wrap/testMolDescriptors.py
@@ -1,7 +1,7 @@
-import Chem
-from Chem import rdMolDescriptors as rdMD
-import DataStructs
-import RDConfig
+from rdkit import Chem
+from rdkit.Chem import rdMolDescriptors as rdMD
+from rdkit import DataStructs
+from rdkit import RDConfig
 import unittest
 
 def feq(v1, v2, tol=1.e-4) :
diff --git a/Code/GraphMol/Descriptors/test_list.py b/Code/GraphMol/Descriptors/test_list.py
index a09b5d0d8..e204be05a 100644
--- a/Code/GraphMol/Descriptors/test_list.py
+++ b/Code/GraphMol/Descriptors/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py b/Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py
index 318267f96..29a71d1f1 100644
--- a/Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py
+++ b/Code/GraphMol/DistGeomHelpers/Wrap/testDistGeom.py
@@ -1,13 +1,13 @@
-import Chem
-from Chem import rdDistGeom,ChemicalForceFields,rdMolAlign
-import RDConfig
+from rdkit import Chem
+from rdkit.Chem import rdDistGeom,ChemicalForceFields,rdMolAlign
+from rdkit import RDConfig
 import unittest
 import os,copy
 import cPickle as pickle
 import math
 import numpy
-from Geometry import rdGeometry as geom
-from RDLogger import logger
+from rdkit.Geometry import rdGeometry as geom
+from rdkit.RDLogger import logger
 logger=logger()
 
 def feq(v1, v2, tol=1.e-4) :
diff --git a/Code/GraphMol/DistGeomHelpers/Wrap/test_list.py b/Code/GraphMol/DistGeomHelpers/Wrap/test_list.py
index 13d1e5d85..6e7cfd5b1 100644
--- a/Code/GraphMol/DistGeomHelpers/Wrap/test_list.py
+++ b/Code/GraphMol/DistGeomHelpers/Wrap/test_list.py
@@ -7,6 +7,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/DistGeomHelpers/test_list.py b/Code/GraphMol/DistGeomHelpers/test_list.py
index 363d15b3e..9e42ae143 100755
--- a/Code/GraphMol/DistGeomHelpers/test_list.py
+++ b/Code/GraphMol/DistGeomHelpers/test_list.py
@@ -10,6 +10,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/FileParsers/test_list.py b/Code/GraphMol/FileParsers/test_list.py
index 4cacd7123..c1f4890ed 100755
--- a/Code/GraphMol/FileParsers/test_list.py
+++ b/Code/GraphMol/FileParsers/test_list.py
@@ -13,6 +13,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/Fingerprints/test_list.py b/Code/GraphMol/Fingerprints/test_list.py
index 3e34cad05..ac5986331 100755
--- a/Code/GraphMol/Fingerprints/test_list.py
+++ b/Code/GraphMol/Fingerprints/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/ForceFieldHelpers/Wrap/testHelpers.py b/Code/GraphMol/ForceFieldHelpers/Wrap/testHelpers.py
index 379e125f8..d7bed9d0f 100644
--- a/Code/GraphMol/ForceFieldHelpers/Wrap/testHelpers.py
+++ b/Code/GraphMol/ForceFieldHelpers/Wrap/testHelpers.py
@@ -1,6 +1,6 @@
-import Chem
-from Chem import ChemicalForceFields
-import RDConfig
+from rdkit import Chem
+from rdkit.Chem import ChemicalForceFields
+from rdkit import RDConfig
 import unittest
 import os
 
diff --git a/Code/GraphMol/ForceFieldHelpers/test_list.py b/Code/GraphMol/ForceFieldHelpers/test_list.py
index 4737153ef..0ac6fbac5 100755
--- a/Code/GraphMol/ForceFieldHelpers/test_list.py
+++ b/Code/GraphMol/ForceFieldHelpers/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/FragCatalog/Wrap/rough_test.py b/Code/GraphMol/FragCatalog/Wrap/rough_test.py
index 4496dcaf2..9e80d635d 100755
--- a/Code/GraphMol/FragCatalog/Wrap/rough_test.py
+++ b/Code/GraphMol/FragCatalog/Wrap/rough_test.py
@@ -9,12 +9,12 @@ it's intended to be shallow, but broad
 
 """
 import unittest,os
-import RDConfig
-from RDLogger import logger
+from rdkit import RDConfig
+from rdkit.RDLogger import logger
 logger=logger()
-import Chem
-from Chem import FragmentCatalog
-import DataStructs
+from rdkit import Chem
+from rdkit.Chem import FragmentCatalog
+from rdkit import DataStructs
 import cPickle
 
 
diff --git a/Code/GraphMol/FragCatalog/Wrap/test_list.py b/Code/GraphMol/FragCatalog/Wrap/test_list.py
index 77c6dab1e..f3e6d0c76 100755
--- a/Code/GraphMol/FragCatalog/Wrap/test_list.py
+++ b/Code/GraphMol/FragCatalog/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/FragCatalog/test_list.py b/Code/GraphMol/FragCatalog/test_list.py
index 3e34cad05..ac5986331 100755
--- a/Code/GraphMol/FragCatalog/test_list.py
+++ b/Code/GraphMol/FragCatalog/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolAlign/Wrap/testMolAlign.py b/Code/GraphMol/MolAlign/Wrap/testMolAlign.py
index 4710eb3c3..a77779d9c 100644
--- a/Code/GraphMol/MolAlign/Wrap/testMolAlign.py
+++ b/Code/GraphMol/MolAlign/Wrap/testMolAlign.py
@@ -4,11 +4,11 @@
 #
 #     @@  All Rights Reserved  @@
 #
-import RDConfig
+from rdkit import RDConfig
 import os,sys
 import unittest
-import Chem
-from Chem import rdMolAlign,rdDistGeom,ChemicalForceFields
+from rdkit import Chem
+from rdkit.Chem import rdMolAlign,rdDistGeom,ChemicalForceFields
 
 def lstFeq(l1, l2, tol=1.e-4):
   if (len(list(l1)) != len(list(l2))):
diff --git a/Code/GraphMol/MolAlign/Wrap/test_list.py b/Code/GraphMol/MolAlign/Wrap/test_list.py
index ae2bf67d5..9e2b54373 100644
--- a/Code/GraphMol/MolAlign/Wrap/test_list.py
+++ b/Code/GraphMol/MolAlign/Wrap/test_list.py
@@ -7,6 +7,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolAlign/test_list.py b/Code/GraphMol/MolAlign/test_list.py
index 56a2e90a6..1b7d3b722 100644
--- a/Code/GraphMol/MolAlign/test_list.py
+++ b/Code/GraphMol/MolAlign/test_list.py
@@ -10,6 +10,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolCatalog/Wrap/rough_test.py b/Code/GraphMol/MolCatalog/Wrap/rough_test.py
index e31d358b5..b32392efa 100755
--- a/Code/GraphMol/MolCatalog/Wrap/rough_test.py
+++ b/Code/GraphMol/MolCatalog/Wrap/rough_test.py
@@ -3,11 +3,11 @@
 #  Copyright (C) 2006  Greg Landrum
 #
 import unittest,os,sys
-import RDConfig
-import Chem
-import DataStructs
+from rdkit import RDConfig
+from rdkit import Chem
+from rdkit import DataStructs
 import cPickle
-from Chem import MolCatalog
+from rdkit.Chem import MolCatalog
 
 class TestCase(unittest.TestCase):
   def test1(self):
diff --git a/Code/GraphMol/MolCatalog/Wrap/test_list.py b/Code/GraphMol/MolCatalog/Wrap/test_list.py
index 77c6dab1e..f3e6d0c76 100755
--- a/Code/GraphMol/MolCatalog/Wrap/test_list.py
+++ b/Code/GraphMol/MolCatalog/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolCatalog/test_list.py b/Code/GraphMol/MolCatalog/test_list.py
index 3e34cad05..ac5986331 100755
--- a/Code/GraphMol/MolCatalog/test_list.py
+++ b/Code/GraphMol/MolCatalog/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolChemicalFeatures/Wrap/testChemicalFeatures.py b/Code/GraphMol/MolChemicalFeatures/Wrap/testChemicalFeatures.py
index 20298de61..c0f305bd5 100644
--- a/Code/GraphMol/MolChemicalFeatures/Wrap/testChemicalFeatures.py
+++ b/Code/GraphMol/MolChemicalFeatures/Wrap/testChemicalFeatures.py
@@ -1,7 +1,7 @@
-import DataStructs
-import Chem
-from Chem import ChemicalFeatures,rdDistGeom
-import Geometry
+from rdkit import DataStructs
+from rdkit import Chem
+from rdkit.Chem import ChemicalFeatures,rdDistGeom
+from rdkit import Geometry
 import unittest
 
 
diff --git a/Code/GraphMol/MolChemicalFeatures/Wrap/test_list.py b/Code/GraphMol/MolChemicalFeatures/Wrap/test_list.py
index a00a50475..ad60ac763 100644
--- a/Code/GraphMol/MolChemicalFeatures/Wrap/test_list.py
+++ b/Code/GraphMol/MolChemicalFeatures/Wrap/test_list.py
@@ -7,6 +7,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolChemicalFeatures/test_list.py b/Code/GraphMol/MolChemicalFeatures/test_list.py
index 8439d5572..25f0f2510 100644
--- a/Code/GraphMol/MolChemicalFeatures/test_list.py
+++ b/Code/GraphMol/MolChemicalFeatures/test_list.py
@@ -10,6 +10,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolTransforms/Wrap/testMolTransforms.py b/Code/GraphMol/MolTransforms/Wrap/testMolTransforms.py
index ebcacd667..3170b041b 100644
--- a/Code/GraphMol/MolTransforms/Wrap/testMolTransforms.py
+++ b/Code/GraphMol/MolTransforms/Wrap/testMolTransforms.py
@@ -1,10 +1,10 @@
-import RDConfig
+from rdkit import RDConfig
 import os,sys
 import unittest
-import DataStructs
-import Chem
-from Geometry import rdGeometry as geom
-from Chem import rdMolTransforms as rdmt
+from rdkit import DataStructs
+from rdkit import Chem
+from rdkit.Geometry import rdGeometry as geom
+from rdkit.Chem import rdMolTransforms as rdmt
 
 def feq(v1, v2, tol=1.0e-4):
     return abs(v1-v2) < tol
diff --git a/Code/GraphMol/MolTransforms/Wrap/test_list.py b/Code/GraphMol/MolTransforms/Wrap/test_list.py
index b34bafce5..5b5d2ed7d 100644
--- a/Code/GraphMol/MolTransforms/Wrap/test_list.py
+++ b/Code/GraphMol/MolTransforms/Wrap/test_list.py
@@ -7,6 +7,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/MolTransforms/test_list.py b/Code/GraphMol/MolTransforms/test_list.py
index 2557018e0..626f876ad 100755
--- a/Code/GraphMol/MolTransforms/test_list.py
+++ b/Code/GraphMol/MolTransforms/test_list.py
@@ -11,6 +11,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/PartialCharges/Wrap/testPartialCharges.py b/Code/GraphMol/PartialCharges/Wrap/testPartialCharges.py
index 7296e1331..5eb865f28 100755
--- a/Code/GraphMol/PartialCharges/Wrap/testPartialCharges.py
+++ b/Code/GraphMol/PartialCharges/Wrap/testPartialCharges.py
@@ -1,6 +1,6 @@
-import Chem
-from Chem import rdPartialCharges
-import RDConfig
+from rdkit import Chem
+from rdkit.Chem import rdPartialCharges
+from rdkit import RDConfig
 import unittest
 import os
 import cPickle as pickle
diff --git a/Code/GraphMol/PartialCharges/Wrap/test_list.py b/Code/GraphMol/PartialCharges/Wrap/test_list.py
index 2c7034d26..9ee296b05 100755
--- a/Code/GraphMol/PartialCharges/Wrap/test_list.py
+++ b/Code/GraphMol/PartialCharges/Wrap/test_list.py
@@ -7,6 +7,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/SLNParse/Wrap/testSLN.py b/Code/GraphMol/SLNParse/Wrap/testSLN.py
index d7b911c02..78ed95a84 100644
--- a/Code/GraphMol/SLNParse/Wrap/testSLN.py
+++ b/Code/GraphMol/SLNParse/Wrap/testSLN.py
@@ -32,10 +32,10 @@
 #
 # Created by Greg Landrum, September 2006
 #
-import Chem
-from Chem import rdSLNParse
-import Geometry
-import RDConfig
+from rdkit import Chem
+from rdkit.Chem import rdSLNParse
+from rdkit import Geometry
+from rdkit import RDConfig
 import unittest
 import os,sys
 
diff --git a/Code/GraphMol/SLNParse/Wrap/test_list.py b/Code/GraphMol/SLNParse/Wrap/test_list.py
index 8dc92c226..3ea178d41 100644
--- a/Code/GraphMol/SLNParse/Wrap/test_list.py
+++ b/Code/GraphMol/SLNParse/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/SLNParse/test_list.py b/Code/GraphMol/SLNParse/test_list.py
index 71236006b..8ad931717 100755
--- a/Code/GraphMol/SLNParse/test_list.py
+++ b/Code/GraphMol/SLNParse/test_list.py
@@ -15,6 +15,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/ShapeHelpers/Wrap/testShapeHelpers.py b/Code/GraphMol/ShapeHelpers/Wrap/testShapeHelpers.py
index bb1689d16..6d26501ac 100644
--- a/Code/GraphMol/ShapeHelpers/Wrap/testShapeHelpers.py
+++ b/Code/GraphMol/ShapeHelpers/Wrap/testShapeHelpers.py
@@ -1,12 +1,12 @@
-import RDConfig
+from rdkit import RDConfig
 import os,sys
 import unittest
-import DataStructs
-import Chem
-from Chem import rdMolAlign
-from Geometry import rdGeometry as geom
-from Chem import rdShapeHelpers as rdshp
-from Chem import rdMolTransforms as rdmt
+from rdkit import DataStructs
+from rdkit import Chem
+from rdkit.Chem import rdMolAlign
+from rdkit.Geometry import rdGeometry as geom
+from rdkit.Chem import rdShapeHelpers as rdshp
+from rdkit.Chem import rdMolTransforms as rdmt
 import math
 
 def feq(v1, v2, tol=1.0e-4):
diff --git a/Code/GraphMol/ShapeHelpers/Wrap/test_list.py b/Code/GraphMol/ShapeHelpers/Wrap/test_list.py
index a884eaec1..74729572b 100644
--- a/Code/GraphMol/ShapeHelpers/Wrap/test_list.py
+++ b/Code/GraphMol/ShapeHelpers/Wrap/test_list.py
@@ -7,6 +7,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/ShapeHelpers/test_list.py b/Code/GraphMol/ShapeHelpers/test_list.py
index 363d15b3e..9e42ae143 100644
--- a/Code/GraphMol/ShapeHelpers/test_list.py
+++ b/Code/GraphMol/ShapeHelpers/test_list.py
@@ -10,6 +10,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/SmilesParse/test_list.py b/Code/GraphMol/SmilesParse/test_list.py
index f80fefd15..6fe9bc273 100755
--- a/Code/GraphMol/SmilesParse/test_list.py
+++ b/Code/GraphMol/SmilesParse/test_list.py
@@ -10,6 +10,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/Subgraphs/test_list.py b/Code/GraphMol/Subgraphs/test_list.py
index 520112950..9f5360e25 100755
--- a/Code/GraphMol/Subgraphs/test_list.py
+++ b/Code/GraphMol/Subgraphs/test_list.py
@@ -10,6 +10,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/Substruct/test_list.py b/Code/GraphMol/Substruct/test_list.py
index f33730099..bb331434e 100755
--- a/Code/GraphMol/Substruct/test_list.py
+++ b/Code/GraphMol/Substruct/test_list.py
@@ -11,6 +11,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/UnitTestQueryMol.py b/Code/GraphMol/UnitTestQueryMol.py
index 34ec7d484..3db50af7d 100755
--- a/Code/GraphMol/UnitTestQueryMol.py
+++ b/Code/GraphMol/UnitTestQueryMol.py
@@ -3,7 +3,7 @@
 """basic unit testing code for query mols
 
 """
-import RDConfig
+from rdkit import RDConfig
 import unittest,os,sys
 
 class TestCase(unittest.TestCase):
diff --git a/Code/GraphMol/Wrap/rough_test.py b/Code/GraphMol/Wrap/rough_test.py
index 107e14666..5bbbac885 100755
--- a/Code/GraphMol/Wrap/rough_test.py
+++ b/Code/GraphMol/Wrap/rough_test.py
@@ -8,11 +8,11 @@
 it's intended to be shallow, but broad
 
 """
-import RDConfig
+from rdkit import RDConfig
 import os,sys,tempfile
 import unittest
-import DataStructs
-import Chem
+from rdkit import DataStructs
+from rdkit import Chem
 
 def feq(v1,v2,tol2=1e-4):
   return abs(v1-v2)<=tol2
@@ -715,7 +715,7 @@ class TestCase(unittest.TestCase):
     self.failUnless(mol.GetNumAtoms()==39)
 
   def test24DaylightFingerprint(self):
-    import DataStructs
+    from rdkit import DataStructs
     m1 = Chem.MolFromSmiles('C1=CC=CC=C1')
     fp1 = Chem.DaylightFingerprint(m1)
     self.failUnless(len(fp1)==2048)
@@ -736,7 +736,7 @@ class TestCase(unittest.TestCase):
     self.failUnless(len(fp3)<2048)
     
   def test24RDKFingerprint(self):
-    import DataStructs
+    from rdkit import DataStructs
     m1 = Chem.MolFromSmiles('C1=CC=CC=C1')
     fp1 = Chem.RDKFingerprint(m1)
     self.failUnless(len(fp1)==2048)
diff --git a/Code/GraphMol/Wrap/testConformer.py b/Code/GraphMol/Wrap/testConformer.py
index 7d593995b..5b15c2a8f 100644
--- a/Code/GraphMol/Wrap/testConformer.py
+++ b/Code/GraphMol/Wrap/testConformer.py
@@ -3,11 +3,11 @@
 #  Copyright (C) 2004  Rational Discovery LLC
 #         All Rights Reserved
 #
-import RDConfig
+from rdkit import RDConfig
 import os,sys
 import unittest
-import Chem
-from Geometry import Point3D
+from rdkit import Chem
+from rdkit.Geometry import Point3D
 
 def feq(v1,v2,tol2=1e-4):
   return abs(v1-v2)<=tol2
diff --git a/Code/GraphMol/Wrap/test_list.py b/Code/GraphMol/Wrap/test_list.py
index 943f777f8..dfcc42a29 100755
--- a/Code/GraphMol/Wrap/test_list.py
+++ b/Code/GraphMol/Wrap/test_list.py
@@ -10,6 +10,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/GraphMol/test_list.py b/Code/GraphMol/test_list.py
index ba42fa827..6101dc984 100755
--- a/Code/GraphMol/test_list.py
+++ b/Code/GraphMol/test_list.py
@@ -53,6 +53,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/ML/FeatureSelect/Wrap/testCMIM.py b/Code/ML/FeatureSelect/Wrap/testCMIM.py
index 385a0cec1..25014eadb 100644
--- a/Code/ML/FeatureSelect/Wrap/testCMIM.py
+++ b/Code/ML/FeatureSelect/Wrap/testCMIM.py
@@ -1,6 +1,6 @@
-from ML import FeatureSelect as FS
-import DataStructs as DS
-import RDConfig
+from rdkit.ML import FeatureSelect as FS
+from rdkit import DataStructs as DS
+from rdkit import RDConfig
 import unittest
 
 class TestCase(unittest.TestCase):
diff --git a/Code/ML/FeatureSelect/Wrap/test_list.py b/Code/ML/FeatureSelect/Wrap/test_list.py
index 42fc6eb24..e5cc1dfe3 100644
--- a/Code/ML/FeatureSelect/Wrap/test_list.py
+++ b/Code/ML/FeatureSelect/Wrap/test_list.py
@@ -3,3 +3,9 @@ tests=[
           ]
 
 longTests=[]
+
+if __name__=='__main__':
+  import sys
+  from rdkit import TestRunner
+  failed,tests = TestRunner.RunScript('test_list.py',0,1)
+  sys.exit(len(failed))
diff --git a/Code/ML/InfoTheory/Wrap/testData/Issue237.pkl b/Code/ML/InfoTheory/Wrap/testData/Issue237.pkl
index 93172c89a..fa867f7a7 100644
--- a/Code/ML/InfoTheory/Wrap/testData/Issue237.pkl
+++ b/Code/ML/InfoTheory/Wrap/testData/Issue237.pkl
@@ -2,7 +2,7 @@
 (lp2
 S'MAC-0024696'
 p3
-acDataStructs.cDataStructs
+acrdkit.DataStructs.cDataStructs
 ExplicitBitVect
 p4
 (S'\xe0\xff\xff\xffy\x0c\x00\x00\x00\x00\x00\x00\xe5/'
diff --git a/Code/ML/InfoTheory/Wrap/testRanker.py b/Code/ML/InfoTheory/Wrap/testRanker.py
index 3700870b6..4b57da6eb 100755
--- a/Code/ML/InfoTheory/Wrap/testRanker.py
+++ b/Code/ML/InfoTheory/Wrap/testRanker.py
@@ -1,7 +1,7 @@
-import RDConfig,RDRandom
+from rdkit import RDConfig,RDRandom
 import unittest
-from ML.InfoTheory import rdInfoTheory as rdit
-import DataStructs
+from rdkit.ML.InfoTheory import rdInfoTheory as rdit
+from rdkit import DataStructs
 import numpy
 import os,cPickle
 
diff --git a/Code/ML/InfoTheory/Wrap/test_list.py b/Code/ML/InfoTheory/Wrap/test_list.py
index 1b8a3f78a..814548a47 100755
--- a/Code/ML/InfoTheory/Wrap/test_list.py
+++ b/Code/ML/InfoTheory/Wrap/test_list.py
@@ -4,3 +4,9 @@ tests=[
     ]
 
 longTests=[]
+
+if __name__=='__main__':
+  import sys
+  from rdkit import TestRunner
+  failed,tests = TestRunner.RunScript('test_list.py',0,1)
+  sys.exit(len(failed))
diff --git a/Code/ML/test_list.py b/Code/ML/test_list.py
index 742f9a054..35d860665 100755
--- a/Code/ML/test_list.py
+++ b/Code/ML/test_list.py
@@ -9,6 +9,6 @@ longTests = [
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Numerics/Alignment/Wrap/testAlignment.py b/Code/Numerics/Alignment/Wrap/testAlignment.py
index 039bad8fe..623768048 100644
--- a/Code/Numerics/Alignment/Wrap/testAlignment.py
+++ b/Code/Numerics/Alignment/Wrap/testAlignment.py
@@ -1,8 +1,8 @@
 ## Automatically adapted for numpy.oldnumeric Jun 27, 2008 by -c
 
-import Numerics.rdAlignment as rdAlg
-import Geometry
-import RDConfig
+import rdkit.Numerics.rdAlignment as rdAlg
+from rdkit import Geometry
+from rdkit import RDConfig
 import os,sys
 import unittest
 import numpy.oldnumeric as Numeric
diff --git a/Code/Numerics/Alignment/Wrap/test_list.py b/Code/Numerics/Alignment/Wrap/test_list.py
index 0cd85c581..c86b9cf71 100644
--- a/Code/Numerics/Alignment/Wrap/test_list.py
+++ b/Code/Numerics/Alignment/Wrap/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Numerics/Alignment/test_list.py b/Code/Numerics/Alignment/test_list.py
index 363d15b3e..9e42ae143 100755
--- a/Code/Numerics/Alignment/test_list.py
+++ b/Code/Numerics/Alignment/test_list.py
@@ -10,6 +10,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Numerics/EigenSolvers/test_list.py b/Code/Numerics/EigenSolvers/test_list.py
index fd93ffe07..cf8deb42f 100755
--- a/Code/Numerics/EigenSolvers/test_list.py
+++ b/Code/Numerics/EigenSolvers/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Numerics/Optimizer/test_list.py b/Code/Numerics/Optimizer/test_list.py
index 8ea4b30b8..ed00f34fa 100755
--- a/Code/Numerics/Optimizer/test_list.py
+++ b/Code/Numerics/Optimizer/test_list.py
@@ -9,6 +9,6 @@ longTests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Numerics/test_list.py b/Code/Numerics/test_list.py
index c1fa9317a..3914611c5 100755
--- a/Code/Numerics/test_list.py
+++ b/Code/Numerics/test_list.py
@@ -10,6 +10,6 @@ tests=[
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/Query/test_list.py b/Code/Query/test_list.py
index 2c0c9d916..82b3822c5 100755
--- a/Code/Query/test_list.py
+++ b/Code/Query/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/RDGeneral/test_list.py b/Code/RDGeneral/test_list.py
index 432681e29..52e74d2d1 100755
--- a/Code/RDGeneral/test_list.py
+++ b/Code/RDGeneral/test_list.py
@@ -9,6 +9,6 @@ longTests=[]
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))
diff --git a/Code/SimDivPickers/Wrap/testMaxMin.py b/Code/SimDivPickers/Wrap/testMaxMin.py
index 37c13e7eb..bf0740156 100755
--- a/Code/SimDivPickers/Wrap/testMaxMin.py
+++ b/Code/SimDivPickers/Wrap/testMaxMin.py
@@ -1,6 +1,6 @@
-from SimDivFilters import rdSimDivPickers as rdsimdiv
+from rdkit.SimDivFilters import rdSimDivPickers as rdsimdiv
 import numpy
-import RDRandom
+from rdkit import RDRandom
 RDRandom.seed(23)
 
 
diff --git a/Code/SimDivPickers/Wrap/testPickers.py b/Code/SimDivPickers/Wrap/testPickers.py
index 0c2faac8d..e378a917f 100755
--- a/Code/SimDivPickers/Wrap/testPickers.py
+++ b/Code/SimDivPickers/Wrap/testPickers.py
@@ -1,7 +1,7 @@
-import RDConfig
+from rdkit import RDConfig
 import unittest
-from SimDivFilters import rdSimDivPickers
-from DataManip.Metric import rdMetricMatrixCalc as rdmmc
+from rdkit.SimDivFilters import rdSimDivPickers
+from rdkit.DataManip.Metric import rdMetricMatrixCalc as rdmmc
 import numpy
 import random
 
@@ -97,7 +97,7 @@ class TestCase(unittest.TestCase):
 
             
   def testNonUniqueCrash(self) :
-    import DataStructs
+    from rdkit import DataStructs
     sz = 10
     nbits=20
     nBitsToSet=int(nbits*.3)
diff --git a/Code/SimDivPickers/Wrap/test_list.py b/Code/SimDivPickers/Wrap/test_list.py
index 22117a484..31cd1cad5 100755
--- a/Code/SimDivPickers/Wrap/test_list.py
+++ b/Code/SimDivPickers/Wrap/test_list.py
@@ -5,3 +5,9 @@ tests=[
     ]
 
 longTests=[]
+
+if __name__=='__main__':
+  import sys
+  from rdkit import TestRunner
+  failed,tests = TestRunner.RunScript('test_list.py',0,1)
+  sys.exit(len(failed))
diff --git a/Code/test_list.py b/Code/test_list.py
index 7324a6662..424e4a884 100755
--- a/Code/test_list.py
+++ b/Code/test_list.py
@@ -23,6 +23,6 @@ longTests = [
 
 if __name__=='__main__':
   import sys
-  import TestRunner
+  from rdkit import TestRunner
   failed,tests = TestRunner.RunScript('test_list.py',0,1)
   sys.exit(len(failed))