Add more pD/pi tests