More improved test coverage.