Created by: Johann-S
Hi,
This PR increase our code coverage by covering some uncovered cases
/CC @XhmikosR