[OTF:1619] Fix broken tests