scheduling improvements and test cleanup