(#2812) - Revive the unit tests
(#2814) - Revive the merge tree tests