Cleaning up of the testing routines.