Modified tests to adjust to the persistent caching.