Fix ScrubTest
Fix LeaveAndBootstrapTest
Fix potential ConcurrentModificationException in tests