Merge pull request #2037 from parneetsingh022/tests/search-str-for-entry-edge-cases