1. Added __init__ file to tests
2. chanaged imports in test files to reflect the first part of the change