Fixed issues found in PCM Test
Misc changes for PCM Test