Updated PSD testing utility