Improve coverage of a few tests a little bit.
Merge pull request #536 from peternewman/coveralls

Improve coverage of a few tests a little bit.