Add more NSRE unit tests