removed diag from tests; fixed closures in psf