Search and Add Tests