Few fixes related to unit tests
Merge pull request #454 from ayushchd/unit_testing

Few fixes related to unit tests