Remove dont_block assertions, clean up taskscheduler tests