Increasing unit test coverage
Merge pull request #487 from CoderLisa/unittest

Increasing unit test coverage