fix phpunit and rework of main features