Small PSR fixes
Add some tests