Fix Eclipse warnings, format and organise imports
Upgrade test dependencies