Improve coverage

[valotas]

This should resole #55

[coveralls]

Coverage increased (+1.9%) to 92.705% when pulling 8e3b815 on issue55/coverage into 1d2c49a on master.

[coveralls]

Coverage increased (+2.01%) to 93.91% when pulling 9d75ea7 on issue55/coverage into 33da62f on master.

[coveralls]

Coverage increased (+2.01%) to 93.91% when pulling 799aec8 on issue55/coverage into 33da62f on master.

[coveralls]

Coverage increased (+2.01%) to 93.91% when pulling b0fac53 on issue55/coverage into 33da62f on master.

[coveralls]

Coverage increased (+0.6%) to 92.481% when pulling fbf0b03 on issue55/coverage into 33da62f on master.

[coveralls]

Coverage increased (+2.07%) to 93.968% when pulling d5ceec3 on issue55/coverage into 33da62f on master.

[coveralls]

Coverage increased (+2.4%) to 94.268% when pulling 8baced5 on issue55/coverage into 33da62f on master.

[coveralls]

Coverage increased (+2.3%) to 94.231% when pulling 745928e on issue55/coverage into 33da62f on master.