Moved tests folder
Corrected import paths and PEP-8 fixes