Remove traces immediately after sync
Reorganized time based tests