Fix composer.json => fix tests
Fix CS