Extract merge tests into their own file.
Extract compatibility tests into their own file.
Remove unused variable from TestUtils.
Fix some test edge cases.