Fix CNW tests because of Phalanx