It is normal that the unittest do not compile (Big change on merge func)