Added more unit-tests and coverage analysis.