cleaned up __init__.py and tests.py