Adding content caching and adding missing tests
Fixing tests
Final fixes to fixtures