update
revising scheduler helper classes for simplification and corresponding tests