NPOTB: fixing unit tests from 9f0b3a2