Increase test coverage

Closes #1