Update __init__.py and how tests imports