PSR and test updates