Cleanup; added jacoco coverage support.