Fixing imports in setupbase.py.
Fixing test logic for nbconvert to get tests to pass.