Added more tests for search and tests for parsing