Continued work on testing routines.  Also modularized Driver somewhat.