Fixing setup.py odd bug with imports that broke testing