Some refactor for FileReader
Some refactor for FileReader
Added folder to test resources