Using jacoco and other fixes.