Add some tests to ClientMergeable