working on testing coverage
Merge pull request #1286 from danmcp/master

Working on test coverage