Changed condition for reAdding.

In particular, increased the timewindow for re-adding and egated the
expectedToSee condition.
Also added some extra thread friendliness.
Removed old hacky block highlighting
Added extra line for ease of experimentation
Removed whitespace