Increase test coverage

Part of #40 .