PLD: adjust urls and tests to new class