Minor stuff

Couple of minor changes.  Added a few more tests, adjusted a few,
cleaned up a few things in cg