Additional merge-base tests (revised)