divide up test data
file tweaks, algorithm tweaks, print statements
fix merge
fix merge