Fix test data generator.
Return more info for search.