Bloddy async tests.
Reorganise test suites.