enable codesniff warnings, fix warnings
fix phpunit issue
fix conflict