Added more search functions and test cases