PLD: fix filter class and add tests