90% test coverage

Fixes #29
Merge pull request #32 from praekelt/feature/test-coverage

90% test coverage