Remove data in favor of data-test
Merge, update, and massage files to get data-test working again.