Reworked test nms 2295