Reorg imports
Add models tests