Index: ../trunk-jpl/test/NightlyRun/test257.py
===================================================================
--- ../trunk-jpl/test/NightlyRun/test257.py	(revision 26638)
+++ ../trunk-jpl/test/NightlyRun/test257.py	(revision 26639)
@@ -23,8 +23,8 @@
 # Generate basin IDs for 3 basins
 idbasin = np.zeros((md.mesh.numberofelements,))
 iid1 = np.where(md.mesh.y >= 2. / 3. * ymax)[0]
-iid2 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x >= 1. / 3. * xmax)[0])
-iid3 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x < 1. / 3. * xmax)[0])
+iid2 = np.where(np.logical_and(md.mesh.y < 2. / 3. * ymax, md.mesh.x >= 1. / 3. * xmax))[0]
+iid3 = np.where(np.logical_and(md.mesh.y < 2. / 3. * ymax, md.mesh.x < 1. / 3. * xmax))[0]
 for ii in range(md.mesh.numberofelements):
     for vertex in range(3):
         if md.mesh.elements[ii][vertex] - 1 in iid1:  # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
Index: ../trunk-jpl/test/NightlyRun/test812.py
===================================================================
--- ../trunk-jpl/test/NightlyRun/test812.py	(revision 26638)
+++ ../trunk-jpl/test/NightlyRun/test812.py	(revision 26639)
@@ -2,11 +2,12 @@
 import numpy as np
 from socket import gethostname
 from model import *
-from parameterize import *
-from setflowequation import *
-from setmask import *
-from solve import *
-from triangle import *
+from parameterize import parameterize
+from setflowequation import setflowequation
+from setmask import setmask
+from solve import solve
+from triangle import triangle
+from SetMLHOBC import SetMLHOBC
 
 md = triangle(model(), '../Exp/Square.exp', 50000.)
 md = setmask(md, 'all', '')