[FIX] Phpcs, phpunit and phpspec fixes