Remove all the import *, fix imports from messages and make the layout
consistent across tests.
This will later allow for more checks using flake8.
There is no functional change.