Tests & review comments addressed.

Code rebased & updated!