Merge pull request #187 from cchan5/master

Updated DataManagerTest
All tests for caching now work