Fix tests and fix code to PSR standarts