Add PSR and SRPA tests