Fix for some tests from pwc test suite