NSF test improvements