Merge pull request #15 from dairiki/master

Test cleanup and better test coverage