Added unit tests
added jacoco coverage