Fixed issues with test cases related to searching