Improved test coverage on some files.