[FIX] Phpunit tests fixes