Fix to PSR standarts and fix tests