Improve test coverage (#30)