Continued work on testing routines.