Simplified test classes and added a convenience class to automatically delete the cache directory on starting a unit test