Some test fixed from FileFinder