This patch improves test coverage for a number of files that had low
coverage. This patch also fixes a few minor bugs found by these tests.