Kibit cleanup.
Added test.  ns cleanup.