Added basic tests for composite and file caching.
Updated tests