Patch unitary test / Thk to Simon aka Saimon