Cleaned up a bit.  Added testrun feature.
Just when you thought you were done, there's more cleaning to do.