FIX + ENH: add ustils.py lost, add missing test

- improve substring search