Assumed Variables improvements for Scheduling/ADT testing