Adding some more PFM tests, and keeping track of return code