PLD: revertapi and fix tests