NSF test improvements

No match.