scheduler updated to use ordsets; acceptance test passes