In-memory search: include FileInfo. More tests pass.

Change-Id: Ic33357b63d1d57dc174fe18360e920730016c903