Fixes to merge-small-files test analogous to those in similar test in Rec