php-cs-fixer and small refactoring in tests