Fix failing Maven 2 integration test
Optimise imports