Tests update
PSR-2 fixes