More NmSimple cleanup.
Test cleanup.