Use fake timer for tests
Remove redundant code RE wachers
Remove redundant code RE wachers