NM unit tests need to be updated by APL
