Improve coverage of tests.