Do not run on CheckInterval either
Add tests