Properly properly re-title NCR tests. r=zcorpan