Test files,  improved IO