Improved test coverage slightly.