Merge "Fix FileTest / OldFileTest."