Fix for a trace bug that was corrupting the trace cache in one replicated pathway
Fix to test case that had got out of sync with itself