Exported NAME and COUNT-NODES.
Reorganized and separated out test module.