Fixed test bug relating to cache recycling
Tests all passing again