Issue #5 (Followup): Fix an issue where the incorrect commit in the history was expected within the test suite when performing an octopus merge.