Bringing CML back

Getting CML up to speed with the new interface.  Also added some stuff
to testing to make sure I import the new testing programs