Improve test coverage

- closes issue #2