Remove the last uses of File in tests