Improved test coverage slightly