Added more UnitTests - CodeCoverage - 69%