Add data ingest file format spec.
Rearrange the tests
Tidied up this test directory