PDIO-293 PDIO-297 Fix tests