Merge pull request #570 from danvk/moar-coverage