Fix pD test cases