Fix failing "file search" tests