Fix issue with FileFinder. Re-enable unit tests