Added file utils and tests