Added more tests + jacoco reporting