minor fixes
CS fixes
PHPUnit: Code Coverage +