The tests compile again
Add a test method to override the resolver
Fix setting up the scheduler in test mode