Group and sort imports.
Fix test suite.