Move tests
Fix imports in tests
Integrate tests into setup.py - can just run python setup.py test now