Untestable codepath are removed from coverage
Merge pull request #150 from nephila/feature/more_coverage

Untestable codepath are removed from coverage