Overall clean-up of JaCoCo coverage