PLD: fix imports and tests, closes #530