Increase test coverage

Fixes #26