Fix integration test
Organised imports, using phpstorm optimize imports feature