Added file tests, fixed problems with file reading