Finally removed all global ns defs.  Added some more tests.