Get some file tests passing again