Unit tests added. Partial test case coverage