Add more mergepatch tests