Fix minor codes

Signed-off-by: Nimbus Le Truand <nimbusletruand@gmail.com>
Test Case with PHPunit

Signed-off-by: Nimbus Le Truand <nimbusletruand@gmail.com>