Fix TestScheduler Handling of Immediate vs Virtual Time
Merge pull request #1903 from benjchristensen/testscheduler-1790

Fix TestScheduler Handling of Immediate vs Virtual Time