Remove buffio which caused seek issues.
Save at the EOF to ensure we move to the next one properly.
Add more detailed test of file skimming and EOF detection.