FIXED : #24 PHPCS fixes
FIXED : #24 PHPUnit fixes