Imports organized
Test minor refactor
Minor fixes