Updates for Travis
Merge pull request #134 from shermdog/unit-tests

Updates for Travis
unit tests for config file, currently code coverage is 50%
added more test cases, coverage is not 67%
Merge pull request #136 from shermdog/unit-tests

Unit tests cherry-picked from Nitin
Merge remote-tracking branch 'upstream/unit-tests' into unit-tests