Fix test coverage/add tests for new logic
Merge pull request #127 from claco/test-coverage

Merged automatically by jenkins after successful build test