Refactor job scheduler

1 job for scheduler in 2 minutes and 5 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Test
passed #23548
tests

00:02:05