PSR up the Tests