Todo tweaks
Looks fine
Extract scheduler tick
Add basic scheduler tests
Extract scheduler tests
This test is covered by scheduler_test now
Break up test files a bit