Split the slow part of data_file.test and merge_data_file.test so that the core tests run fast
Merge pull request #118 from cmaloney/merge-data-file-test-split-slow

Split out the slow parts of some tests