implmented code reviews and fixed some tests which I missed in earlier commit
Merge pull request #116 from naveenhooda2000/develop

implmented code reviews and fixed some tests which I missed in earlier c...