For SVY-7148 : Add a clear separation for types between FULL
Fixed a merge error + updated some unit tests.