diff test: add tests for combine-diff with orderfile