merging data: test files, fixing some wrong pass conditions