Improve tests and fix jacoco value