Some changes for reading files and a test file.