Increased test coverage of search