increase coverage
bit_more_coverage
fix tests
nearly full coverage
Merge pull request #34 from hayd/more_coverage

increase coverage