PDIO-235 Fix tests