Added JaCoCo plugin dependency.
Minor modifications to entities