Updated some of the Charpentier tests.  More to be done.  Sorted out the cache