PZP system test fixes