PLD: refactor ns in tests