Working on filling out the tests
Minor fiddling
Merge branch 'feature/fillouttests' into develop
Working on the main system
Fixed the cache and coverage
Merge branch 'feature/addcachereader' into develop