Added testing for search
Merged with front end branch