Further code simplification

Enabled strict mode on PHPUnit
Added a test case