Updates for Issue 7, hotcache removal, all tests running