Finally fixing flaky test issues.

I forgot we loaded up stale content *before* clearing.