Fixes #25. Test improvements to reach 80% coverage.