Refactored for setup.py, moving tests.