fix merged nosetests.