Improve coverage moar.
Merge pull request #110 from bukzor/improve_coverage_moar

Improve coverage moar.