PSF self-test and correct Makefile for FDNTPSFEx
Merge branch 'DG'