Search and Add tests