PLD: organize tests as unit tests