1576 | Subhas | Enhanced spec for scheduler