Improving test coverage.
Merge pull request #23 from collective/issue_15

Improving test coverage.