Switch to PSON
Fixup test