Added file format test
Added TODOs
Added file tests