Added More Tests and Jacoco coverage.