scheduler tests + improvements