Merged the majority of the PFS test cases. There are still 19 failing test cases that need more attention.