Updated: Unit tests #1

Created by: SunilMohanAdapa

I have added a couple of more tests and fixed minor styling issues. This is a commit on top of rebased #86.