Minor clean-up of file tests