Add PSR and SRPA tests

Ported a couple of the ruby test methods