FileReaderTest added. Old tests updated.