PLD: modal tests and refactor