Reorganise imports.
Refactor code to remove cycles.
Remove ignored test.