Added test data and code for fixmate, flatstat and merge