Merge, update, and massage files to get data-test working again.