[TASK] Bring coverage up
Merge pull request #658 from NamelessCoder/coverageagain

[TASK] Bring coverage up