Fix: fixing test file
Fix: better handling fle