Organise imports
This passes reliably - I had to bump the impatient repo to 6 seconds

A change to the functional tests - the checkpoint state is now in a var,
rather than specified for each scan - otherwise, can't make the tests on
the self-scheduled scan-for-overdue stuff work.