Merge "Add NR test to PM Mapper CSITs"