More cleanup.
Added test programs.