merge-parser: Use timestamp in file instead of the file table

Correct the unit test to handle this as well.