RF: add schedulers, work round test errors