Add unit testcases and adressed comments