[TESTS] Minor renaming, add __init__.py for testing,