Reorganize imports
Simplify test