Minor cleanup of NSH test