From ff8b846da1a6193d3f48638b8703aec4bfe2bf78 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 29 Mar 2023 16:58:58 -0700
Subject: [PATCH] More baselining for timeouts that make furture changes easier

---
 src/compiler/sys.ts                           |  12 +-
 src/compiler/tsbuildPublic.ts                 |   4 +-
 src/compiler/watchPublic.ts                   |   4 +-
 src/server/session.ts                         |  20 +-
 src/server/utilities.ts                       |   4 +-
 .../tsbuildWatch/configFileErrors.ts          |  13 +-
 src/testRunner/unittests/tsbuildWatch/demo.ts |  10 +-
 .../tsbuildWatch/moduleResolution.ts          |   5 +-
 .../unittests/tsbuildWatch/noEmit.ts          |  10 +-
 .../unittests/tsbuildWatch/noEmitOnError.ts   |  10 +-
 .../unittests/tsbuildWatch/programUpdates.ts  | 108 +--
 .../tsbuildWatch/projectsBuilding.ts          |  28 +-
 .../unittests/tsbuildWatch/publicApi.ts       |   5 +-
 .../unittests/tsbuildWatch/reexport.ts        |  10 +-
 .../tsbuildWatch/watchEnvironment.ts          |  16 +-
 src/testRunner/unittests/tscWatch/emit.ts     |  42 +-
 .../unittests/tscWatch/emitAndErrorUpdates.ts |   4 +-
 src/testRunner/unittests/tscWatch/helpers.ts  |  46 +-
 .../unittests/tscWatch/programUpdates.ts      |  84 +-
 .../tscWatch/projectsWithReferences.ts        |  62 +-
 .../unittests/tscWatch/resolutionCache.ts     |  12 +-
 src/testRunner/unittests/tscWatch/watchApi.ts |  44 +-
 .../unittests/tscWatch/watchEnvironment.ts    | 101 +--
 .../tsserver/cachingFileSystemInformation.ts  |  28 +-
 .../unittests/tsserver/cancellationToken.ts   |   4 +-
 .../unittests/tsserver/configuredProjects.ts  |  31 +-
 .../unittests/tsserver/dynamicFiles.ts        |   2 +-
 .../events/projectLanguageServiceState.ts     |   2 +-
 .../tsserver/events/projectLoading.ts         |   4 +-
 .../events/projectUpdatedInBackground.ts      |   2 +-
 .../unittests/tsserver/externalProjects.ts    |   2 +-
 .../forceConsistentCasingInFileNames.ts       |   8 +-
 src/testRunner/unittests/tsserver/helpers.ts  |  69 +-
 .../tsserver/inconsistentErrorInEditor.ts     |   4 +-
 .../unittests/tsserver/inferredProjects.ts    |   6 +-
 .../unittests/tsserver/moduleResolution.ts    |   2 +-
 src/testRunner/unittests/tsserver/openFile.ts |   6 +-
 .../tsserver/partialSemanticServer.ts         |   2 +-
 .../unittests/tsserver/projectErrors.ts       |  52 +-
 .../unittests/tsserver/projectReferences.ts   |  42 +-
 src/testRunner/unittests/tsserver/projects.ts |  28 +-
 .../tsserver/projectsWithReferences.ts        |  42 +-
 .../unittests/tsserver/reloadProjects.ts      |  12 +-
 .../unittests/tsserver/resolutionCache.ts     |  24 +-
 src/testRunner/unittests/tsserver/symLinks.ts |  14 +-
 .../unittests/tsserver/syntaxOperations.ts    |   4 +-
 .../tsserver/typeReferenceDirectives.ts       |   2 +-
 .../unittests/tsserver/typingsInstaller.ts    |  48 +-
 .../unittests/tsserver/watchEnvironment.ts    |   2 +-
 .../unittests/virtualFileSystemWithWatch.ts   |  47 +-
 .../reports-syntax-errors-in-config-file.js   |  12 +
 .../demo/updates-with-bad-reference.js        |   3 +
 .../demo/updates-with-circular-reference.js   |   7 +
 ...for-changes-to-package-json-main-fields.js |   6 +
 ...t-correctly-with-cts-and-mts-extensions.js |  16 +
 ...se-different-module-resolution-settings.js |   3 +
 ...n-no-files-are-emitted-with-incremental.js |   6 +
 ...when-watching-when-no-files-are-emitted.js |   6 +
 ...mit-any-files-on-error-with-incremental.js |  18 +
 .../does-not-emit-any-files-on-error.js       |  18 +
 .../incremental-updates-in-verbose-mode.js    |  10 +
 .../when-file-with-no-error-changes.js        |   6 +
 ...ing-errors-only-changed-file-is-emitted.js |   6 +
 .../when-file-with-no-error-changes.js        |   3 +
 ...ixing-error-files-all-files-are-emitted.js |   3 +
 .../when-preserveWatchOutput-is-not-used.js   |   6 +
 ...veWatchOutput-is-passed-on-command-line.js |   6 +
 ...e-of-program-emit-with-outDir-specified.js |   7 +
 ...r-recompilation-because-of-program-emit.js |   7 +
 ...tches-config-files-that-are-not-present.js |   7 +
 ...e-down-stream-project-and-then-fixes-it.js |  14 +
 ...ncing-project-even-for-non-local-change.js |  14 +
 ...le-is-added,-and-its-subsequent-updates.js |  14 +
 ...hanges-and-reports-found-errors-message.js |  21 +
 ...not-start-build-of-referencing-projects.js |   3 +
 ...le-is-added,-and-its-subsequent-updates.js |  14 +
 ...hanges-and-reports-found-errors-message.js |  21 +
 ...not-start-build-of-referencing-projects.js |   3 +
 ...project-with-extended-config-is-removed.js |   3 +
 ...hen-noUnusedParameters-changes-to-false.js |   3 +
 .../works-with-extended-source-files.js       |  29 +
 ...hen-there-are-23-projects-in-a-solution.js |  75 ++
 ...when-there-are-3-projects-in-a-solution.js |  14 +
 ...when-there-are-5-projects-in-a-solution.js |  14 +
 ...when-there-are-8-projects-in-a-solution.js |  35 +
 .../publicApi/with-custom-transformers.js     |   7 +
 .../reexport/Reports-errors-correctly.js      |  14 +
 ...e-projects-with-single-watcher-per-file.js |  22 +
 .../createWatchOfConfigFile.js                |   3 +
 ...Result-on-WatchCompilerHostOfConfigFile.js |   3 +
 .../consoleClearing/with---diagnostics.js     |   3 +
 .../with---extendedDiagnostics.js             |   3 +
 .../with---preserveWatchOutput.js             |   3 +
 ...---diagnostics-or---extendedDiagnostics.js |   3 +
 ...ms-correctly-in-incremental-compilation.js |   3 +
 ...s-deleted-and-created-as-part-of-change.js |   3 +
 ...ndles-new-lines-carriageReturn-lineFeed.js |   3 +
 .../handles-new-lines-lineFeed.js             |   3 +
 .../should-emit-specified-file.js             |   6 +
 ...elf-if-'--isolatedModules'-is-specified.js |   3 +
 ...-if-'--out'-or-'--outFile'-is-specified.js |   3 +
 ...should-be-up-to-date-with-deleted-files.js |   3 +
 ...-be-up-to-date-with-newly-created-files.js |   3 +
 ...-to-date-with-the-reference-map-changes.js |  15 +
 ...les-referencing-it-if-its-shape-changed.js |   6 +
 ...should-detect-changes-in-non-root-files.js |   6 +
 .../should-detect-non-existing-code-file.js   |   6 +
 .../should-detect-removed-code-file.js        |   3 +
 ...ll-files-if-a-global-file-changed-shape.js |   3 +
 ...ould-return-cascaded-affected-file-list.js |   9 +
 ...fine-for-files-with-circular-references.js |   3 +
 .../config-does-not-have-out-or-outFile.js    |   6 +
 .../config-has-out.js                         |   6 +
 .../config-has-outFile.js                     |   6 +
 ...-recursive-directory-watcher-is-invoked.js |   3 +
 ...rrors-for-.d.ts-change-with-incremental.js |   9 +
 .../errors-for-.d.ts-change.js                |   9 +
 .../errors-for-.ts-change-with-incremental.js |   9 +
 .../errors-for-.ts-change.js                  |   9 +
 ...el-import-that-changes-with-incremental.js |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../export-with-incremental.js                |   9 +
 .../no-circular-import/export.js              |   9 +
 .../exports-with-incremental.js               |   9 +
 .../yes-circular-import/exports.js            |   9 +
 .../with-noEmitOnError-with-incremental.js    |  18 +
 .../with-noEmitOnError.js                     |  18 +
 ...rrors-for-.d.ts-change-with-incremental.js |   9 +
 .../errors-for-.d.ts-change.js                |   9 +
 .../errors-for-.ts-change-with-incremental.js |   9 +
 .../errors-for-.ts-change.js                  |   9 +
 ...el-import-that-changes-with-incremental.js |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../export-with-incremental.js                |   9 +
 .../no-circular-import/export.js              |   9 +
 .../exports-with-incremental.js               |   9 +
 .../yes-circular-import/exports.js            |   9 +
 .../with-noEmitOnError-with-incremental.js    |  18 +
 .../with-noEmitOnError.js                     |  18 +
 ...rrors-for-.d.ts-change-with-incremental.js |   9 +
 .../errors-for-.d.ts-change.js                |   9 +
 .../errors-for-.ts-change-with-incremental.js |   9 +
 .../errors-for-.ts-change.js                  |   9 +
 ...el-import-that-changes-with-incremental.js |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../export-with-incremental.js                |   9 +
 .../no-circular-import/export.js              |   9 +
 .../exports-with-incremental.js               |   9 +
 .../yes-circular-import/exports.js            |   9 +
 .../with-noEmitOnError-with-incremental.js    |  18 +
 .../default/with-noEmitOnError.js             |  18 +
 ...rrors-for-.d.ts-change-with-incremental.js |   9 +
 .../errors-for-.d.ts-change.js                |   9 +
 .../errors-for-.ts-change-with-incremental.js |   9 +
 .../errors-for-.ts-change.js                  |   9 +
 ...el-import-that-changes-with-incremental.js |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../export-with-incremental.js                |   9 +
 .../no-circular-import/export.js              |   9 +
 .../exports-with-incremental.js               |   9 +
 .../yes-circular-import/exports.js            |   9 +
 .../with-noEmitOnError-with-incremental.js    |  18 +
 .../defaultAndD/with-noEmitOnError.js         |  18 +
 ...rrors-for-.d.ts-change-with-incremental.js |   9 +
 .../errors-for-.d.ts-change.js                |   9 +
 .../errors-for-.ts-change-with-incremental.js |   9 +
 .../errors-for-.ts-change.js                  |   9 +
 ...el-import-that-changes-with-incremental.js |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../export-with-incremental.js                |   9 +
 .../no-circular-import/export.js              |   9 +
 .../exports-with-incremental.js               |   9 +
 .../yes-circular-import/exports.js            |   9 +
 .../with-noEmitOnError-with-incremental.js    |  18 +
 .../isolatedModules/with-noEmitOnError.js     |  18 +
 ...rrors-for-.d.ts-change-with-incremental.js |   9 +
 .../errors-for-.d.ts-change.js                |   9 +
 .../errors-for-.ts-change-with-incremental.js |   9 +
 .../errors-for-.ts-change.js                  |   9 +
 ...el-import-that-changes-with-incremental.js |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../export-with-incremental.js                |   9 +
 .../no-circular-import/export.js              |   9 +
 .../exports-with-incremental.js               |   9 +
 .../yes-circular-import/exports.js            |   9 +
 .../with-noEmitOnError-with-incremental.js    |  18 +
 .../isolatedModulesAndD/with-noEmitOnError.js |  18 +
 ...n-Windows-style-drive-root-is-lowercase.js |   3 +
 ...n-Windows-style-drive-root-is-uppercase.js |   3 +
 ...ry-symlink-target-and-import-match-disk.js |   3 +
 ...le-symlink-target-and-import-match-disk.js |   3 +
 ...nging-module-name-with-different-casing.js |   3 +
 ...target-matches-disk-but-import-does-not.js |   3 +
 ...target-matches-disk-but-import-does-not.js |   3 +
 ...link-target,-and-disk-are-all-different.js |   3 +
 ...link-target,-and-disk-are-all-different.js |   3 +
 ...link-target-agree-but-do-not-match-disk.js |   3 +
 ...link-target-agree-but-do-not-match-disk.js |   3 +
 ...k-but-directory-symlink-target-does-not.js |   3 +
 ...s-disk-but-file-symlink-target-does-not.js |   3 +
 ...ative-information-file-location-changes.js |   3 +
 ...hen-renaming-file-with-different-casing.js |   3 +
 .../diagnostics-from-cache.js                 |   3 +
 ...esolutions-from-file-are-partially-used.js |   3 +
 ...en-package-json-with-type-module-exists.js |  35 +
 .../package-json-file-is-edited.js            |  35 +
 .../type-reference-resolutions-reuse.js       |   3 +
 ...for-changes-to-package-json-main-fields.js |  14 +
 .../esm-mode-file-is-edited.js                |   3 +
 ...configFile-contents-when-options-change.js |   3 +
 ...rts-errors-when-the-config-file-changes.js |   6 +
 ...en-'--allowArbitraryExtensions'-changes.js |   6 +
 ...nostics-when-'--noUnusedLabels'-changes.js |   6 +
 ...-a-configured-program-without-file-list.js |   3 +
 ...hould-remove-the-module-not-found-error.js |   7 +
 ...has-changed-(new-file-in-list-of-files).js |   3 +
 ...ot-files-has-changed-(new-file-on-disk).js |   3 +
 ...-root-files-has-changed-through-include.js |   3 +
 ...-when-set-of-root-files-was-not-changed.js |   3 +
 .../programUpdates/change-module-to-none.js   |   3 +
 ...iles-are-reflected-in-project-structure.js |   3 +
 .../programUpdates/config-file-is-deleted.js  |   4 +
 ...s-changes-in-lib-section-of-config-file.js |   3 +
 ...keys-differ-only-in-directory-seperator.js |   6 +
 ...eleted-files-affect-project-structure-2.js |   3 +
 .../deleted-files-affect-project-structure.js |   3 +
 .../extended-source-files-are-watched.js      |  12 +
 .../file-in-files-is-deleted.js               |   3 +
 .../handle-recreated-files-correctly.js       |   9 +
 ...se-they-were-added-with-tripleSlashRefs.js |   3 +
 ...tore-the-states-for-configured-projects.js |  13 +
 ...estore-the-states-for-inferred-projects.js |  12 +
 ...rors-correctly-with-file-not-in-rootDir.js |   3 +
 ...s-errors-correctly-with-isolatedModules.js |   3 +
 .../declarationDir-is-specified.js            |   8 +
 ...-outDir-and-declarationDir-is-specified.js |   8 +
 .../when-outDir-is-specified.js               |   8 +
 .../with-outFile.js                           |   8 +
 ...e-is-specified-with-declaration-enabled.js |   8 +
 .../without-outDir-or-outFile-is-specified.js |   8 +
 ...odule-resolution-changes-in-config-file.js |   3 +
 .../should-reflect-change-in-config-file.js   |   6 +
 ...when-file-changes-from-global-to-module.js |   3 +
 ...programs-are-not-affected-by-each-other.js |   2 +
 ...tes-diagnostics-and-emit-for-decorators.js |   6 +
 ...it-when-useDefineForClassFields-changes.js |   3 +
 .../updates-emit-on-jsx-option-change.js      |   3 +
 ...mit-when-importsNotUsedAsValues-changes.js |   9 +
 ...on-emit-is-disabled-in-compiler-options.js |  12 +
 .../with-default-options.js                   |   6 +
 .../with-skipDefaultLibCheck.js               |   6 +
 .../with-skipLibCheck.js                      |   6 +
 .../with-default-options.js                   |   6 +
 .../with-skipDefaultLibCheck.js               |   6 +
 .../with-skipLibCheck.js                      |   6 +
 ...when-ambient-modules-of-program-changes.js |   6 +
 ...orceConsistentCasingInFileNames-changes.js |   3 +
 ...s-errors-when-noErrorTruncation-changes.js |   3 +
 ...es-errors-when-strictNullChecks-changes.js |   9 +
 ...solution-when-resolveJsonModule-changes.js |   3 +
 ...and-new-file-is-added-as-part-of-change.js |   3 +
 ...owImportingTsExtensions`-of-config-file.js |   3 +
 .../when-creating-extensionless-file.js       |   3 +
 ...n-creating-new-file-in-symlinked-folder.js |   3 +
 ...file-is-added-to-the-referenced-project.js |  14 +
 ...ibCheck-and-skipDefaultLibCheck-changes.js |  18 +
 ...-file-is-changed-but-its-content-havent.js |   3 +
 .../on-sample-project.js                      |   8 +
 ...-different-folders-with-no-files-clause.js |  31 +
 ...nsitive-references-in-different-folders.js |  31 +
 .../on-transitive-references.js               |  27 +
 ...n-declarationMap-changes-for-dependency.js |   3 +
 .../tscWatch/resolutionCache/caching-works.js |   9 +
 .../watch-with-configFile.js                  |   2 +
 .../watch-without-configFile.js               |   2 +
 .../loads-missing-files-from-disk.js          |   4 +
 .../reusing-type-ref-resolution.js            |  16 +
 ...module-goes-missing-and-then-comes-back.js |  11 +
 ...are-global-and-installed-at-later-point.js |  10 +
 ...cluded-file-with-ambient-module-changes.js |   3 +
 ...-no-notification-from-fs-for-index-file.js |  20 +
 ...le-resolution-changes-to-ambient-module.js |   4 +
 ...der-that-already-contains-@types-folder.js |   4 +
 ...rogram-with-files-from-external-library.js |   3 +
 ...-prefers-declaration-file-over-document.js |   3 +
 .../extraFileExtensions-are-supported.js      |   3 +
 ...not-implement-hasInvalidatedResolutions.js |   9 +
 ...st-implements-hasInvalidatedResolutions.js |   9 +
 ...createSemanticDiagnosticsBuilderProgram.js |   3 +
 ...ting-with-emitOnlyDtsFiles-with-outFile.js |  11 +
 .../when-emitting-with-emitOnlyDtsFiles.js    |  11 +
 ...ing-useSourceOfProjectReferenceRedirect.js |  14 +
 ...-host-implementing-getParsedCommandLine.js |   7 +
 ...oject-when-there-is-no-config-file-name.js |   3 +
 ...tends-when-there-is-no-config-file-name.js |   6 +
 ...-timesouts-on-host-program-gets-updated.js |   2 +
 .../fsEvent-for-change-is-repeated.js         |  12 +
 ...inode-when-rename-event-ends-with-tilde.js |   8 +
 ...e-occurs-when-file-is-still-on-the-disk.js |   6 +
 ...when-using-file-watching-thats-on-inode.js |   8 +
 ...e-occurs-when-file-is-still-on-the-disk.js |   6 +
 ...polling-when-renaming-file-in-subfolder.js |  15 +
 ...rectory-when-renaming-file-in-subfolder.js |   3 +
 ...tchFile-when-renaming-file-in-subfolder.js |   4 +
 ...hronous-watch-directory-renaming-a-file.js |  21 +
 ...ory-with-outDir-and-declaration-enabled.js |  17 +
 .../with-non-synchronous-watch-directory.js   |  45 +
 .../using-dynamic-priority-polling.js         | 842 ++++++++++++++++++
 .../using-fixed-chunk-size-polling.js         |  30 +
 ...eDirectories-option-extendedDiagnostics.js |   2 +
 ...-directory-watching-extendedDiagnostics.js |   5 +
 ...ption-with-recursive-directory-watching.js |   5 +
 .../with-excludeDirectories-option.js         |   2 +
 ...excludeFiles-option-extendedDiagnostics.js |   2 +
 .../watchOptions/with-excludeFiles-option.js  |   2 +
 ...s-on-AutoImportProviderProject-creation.js |   5 +-
 ...-FLLs-in-Classic-module-resolution-mode.js |  13 +-
 ...der-FLLs-in-Node-module-resolution-mode.js |  13 +-
 .../loads-missing-files-from-disk.js          |   7 +-
 ...-when-timeout-occurs-after-installation.js |  51 +-
 ...n-timeout-occurs-inbetween-installation.js |  77 +-
 ...-file-with-case-insensitive-file-system.js |   6 +-
 ...ig-file-with-case-sensitive-file-system.js |   6 +-
 ...n-creating-new-file-in-symlinked-folder.js |   6 +-
 ...eive-event-for-the-@types-file-addition.js |   8 +-
 .../cancellationT/Geterr-is-cancellable.js    |  41 +-
 .../cancellationT/is-attached-to-request.js   |  16 +-
 .../configProjects-uptodate-with-new-files.js |   6 +-
 ...-searching-for-inferred-project-again-2.js |   5 +-
 ...en-searching-for-inferred-project-again.js |   5 +-
 .../tsconfig-for-the-file-does-not-exist.js   |  11 +-
 .../tsconfig-for-the-file-exists.js           |  11 +-
 ...-are-all-closed-when-the-update-happens.js |   6 +-
 ...oject-as-part-of-configured-file-update.js |   6 +-
 ...onfig-file-in-a-folder-with-loose-files.js |  11 +-
 ...-a-configured-project-without-file-list.js |   6 +-
 ...has-changed-(new-file-in-list-of-files).js |   6 +-
 ...ot-files-has-changed-(new-file-on-disk).js |   6 +-
 ...-when-set-of-root-files-was-not-changed.js |   6 +-
 ...on-reflected-when-specifying-files-list.js |  13 +-
 ...er-old-one-without-file-being-in-config.js |  36 +-
 ...invoked,-ask-errors-on-it-after-old-one.js |  46 +-
 ...re-old-one-without-file-being-in-config.js |  36 +-
 ...nvoked,-ask-errors-on-it-before-old-one.js |  46 +-
 ...er-old-one-without-file-being-in-config.js |  36 +-
 ...invoked,-ask-errors-on-it-after-old-one.js |  46 +-
 ...re-old-one-without-file-being-in-config.js |  36 +-
 ...nvoked,-ask-errors-on-it-before-old-one.js |  46 +-
 .../handle-recreated-files-correctly.js       |  12 +-
 ...ject-if-it-is-referenced-from-root-file.js |   6 +-
 ...e-tolerated-without-crashing-the-server.js |   4 +-
 ...odule-resolution-changes-in-config-file.js |   6 +-
 ...e-extended-configs-of-multiple-projects.js |  26 +-
 ...re-open-detects-correct-default-project.js |  32 +-
 .../dynamicFiles/opening-untitled-files.js    |   3 +-
 ...e-service-disabled-events-are-triggered.js |   8 +-
 ...g-file-when-using-default-event-handler.js |   7 +-
 ...ed-config-file-when-using-event-handler.js |   6 +-
 ...g-file-when-using-default-event-handler.js |   7 +-
 ...he-config-file-when-using-event-handler.js |   6 +-
 ...he-session-and-project-is-at-root-level.js |  14 +-
 ...ession-and-project-is-not-at-root-level.js |  19 +-
 ...tself-if---isolatedModules-is-specified.js |  15 +-
 ...self-if---out-or---outFile-is-specified.js |  15 +-
 ...should-be-up-to-date-with-deleted-files.js |  16 +-
 ...-be-up-to-date-with-newly-created-files.js |  16 +-
 ...-to-date-with-the-reference-map-changes.js |  37 +-
 ...session-and-should-contains-only-itself.js |  21 +-
 ...should-detect-changes-in-non-root-files.js |  21 +-
 ...nd-should-detect-non-existing-code-file.js |  12 +-
 ...ion-and-should-detect-removed-code-file.js |   6 +-
 ...ll-files-if-a-global-file-changed-shape.js |  15 +-
 ...ould-return-cascaded-affected-file-list.js |  27 +-
 ...fine-for-files-with-circular-references.js |   6 +-
 ...et-in-the-session-and-when---out-is-set.js |  12 +-
 ...n-the-session-and-when---outFile-is-set.js |  12 +-
 ...in-the-session-and-when-adding-new-file.js |  12 +-
 ...ssion-and-when-both-options-are-not-set.js |  12 +-
 ...oundUpdate-and-project-is-at-root-level.js |  14 +-
 ...Update-and-project-is-not-at-root-level.js |  19 +-
 ...tself-if---isolatedModules-is-specified.js |  15 +-
 ...self-if---out-or---outFile-is-specified.js |  15 +-
 ...should-be-up-to-date-with-deleted-files.js |  16 +-
 ...-be-up-to-date-with-newly-created-files.js |  16 +-
 ...-to-date-with-the-reference-map-changes.js |  37 +-
 ...dUpdate-and-should-contains-only-itself.js |  21 +-
 ...should-detect-changes-in-non-root-files.js |  21 +-
 ...nd-should-detect-non-existing-code-file.js |  12 +-
 ...ate-and-should-detect-removed-code-file.js |   6 +-
 ...ll-files-if-a-global-file-changed-shape.js |  15 +-
 ...ould-return-cascaded-affected-file-list.js |  27 +-
 ...fine-for-files-with-circular-references.js |   6 +-
 ...nBackgroundUpdate-and-when---out-is-set.js |  12 +-
 ...kgroundUpdate-and-when---outFile-is-set.js |  12 +-
 ...ckgroundUpdate-and-when-adding-new-file.js |  12 +-
 ...pdate-and-when-both-options-are-not-set.js |  12 +-
 ...oundUpdate-and-project-is-at-root-level.js |  16 +-
 ...Update-and-project-is-not-at-root-level.js |  20 +-
 ...tself-if---isolatedModules-is-specified.js |  16 +-
 ...self-if---out-or---outFile-is-specified.js |  16 +-
 ...should-be-up-to-date-with-deleted-files.js |  17 +-
 ...-be-up-to-date-with-newly-created-files.js |  17 +-
 ...-to-date-with-the-reference-map-changes.js |  44 +-
 ...dUpdate-and-should-contains-only-itself.js |  24 +-
 ...should-detect-changes-in-non-root-files.js |  24 +-
 ...nd-should-detect-non-existing-code-file.js |  15 +-
 ...ate-and-should-detect-removed-code-file.js |   7 +-
 ...ll-files-if-a-global-file-changed-shape.js |  16 +-
 ...ould-return-cascaded-affected-file-list.js |  32 +-
 ...fine-for-files-with-circular-references.js |   7 +-
 ...nBackgroundUpdate-and-when---out-is-set.js |  15 +-
 ...kgroundUpdate-and-when---outFile-is-set.js |  15 +-
 ...ckgroundUpdate-and-when-adding-new-file.js |  15 +-
 ...pdate-and-when-both-options-are-not-set.js |  15 +-
 ...ckage.json-is-changed-inconsequentially.js |   4 +-
 ...-file-is-opened-with-different-contents.js |   4 +-
 ...idates-the-cache-when-files-are-deleted.js |   6 +-
 ...ates-the-cache-when-new-files-are-added.js |   6 +-
 ...ge-results-in-AutoImportProvider-change.js |   4 +-
 ...s-changes-in-lib-section-of-config-file.js |   6 +-
 ...nging-module-name-with-different-casing.js |  32 +-
 ...hen-renaming-file-with-different-casing.js |  48 +-
 .../should-not-error.js                       |  16 +-
 .../should-not-error.js                       |  16 +-
 ...n-files-should-not-schedule-any-refresh.js |   3 +-
 .../project-settings-for-inferred-projects.js |   7 +-
 ...project-if-useOneInferredProject-is-set.js |   6 +-
 ...en-package-json-with-type-module-exists.js | 150 ++--
 .../package-json-file-is-edited.js            | 150 ++--
 ...date-the-cache-when-new-files-are-added.js |   6 +-
 ...n-in-contained-node_modules-directories.js |   4 +-
 ...he-cache-when-local-packageJson-changes.js |   4 +-
 ...-when-module-resolution-settings-change.js |   6 +-
 ...ache-when-symlinks-are-added-or-removed.js |   6 +-
 .../different-content-refreshes-sourceFile.js |   6 +-
 .../openfile/does-not-refresh-sourceFile.js   |   6 +-
 ...ot-refresh-sourceFile-if-contents-match.js |   6 +-
 ...ile-and-then-close-refreshes-sourceFile.js |   6 +-
 ...-directives,-they-are-handled-correcrly.js |  48 +-
 ...-diagnostics-are-returned-with-no-error.js |   5 +-
 ...-external-files-with-config-file-reload.js |   6 +-
 ...-generated-when-the-config-file-changes.js |  15 +-
 ...-same-ambient-module-and-is-also-module.js |  36 +-
 ...iagnostics-after-noUnusedLabels-changes.js |   6 +-
 ...project-structure-and-reports-no-errors.js |  44 +-
 .../getting-errors-before-opening-file.js     |   5 +-
 ...-when-timeout-occurs-after-installation.js | 134 ++-
 ...n-timeout-occurs-inbetween-installation.js | 128 ++-
 ...pened-right-after-closing-the-root-file.js |  64 +-
 ...hen-json-is-root-file-found-by-tsconfig.js |  16 +-
 ...json-is-not-root-file-found-by-tsconfig.js |  16 +-
 ...esnt-exist-on-disk-yet-with-projectRoot.js |  18 +-
 ...t-exist-on-disk-yet-without-projectRoot.js |  18 +-
 ...or-returns-includes-global-error-getErr.js |  16 +-
 ...-includes-global-error-geterrForProject.js |  16 +-
 ...n-dependency-project-is-not-open-getErr.js |  16 +-
 ...cy-project-is-not-open-geterrForProject.js |  64 +-
 ...-when-the-depedency-file-is-open-getErr.js |  32 +-
 ...depedency-file-is-open-geterrForProject.js |  48 +-
 ...n-dependency-project-is-not-open-getErr.js |  16 +-
 ...cy-project-is-not-open-geterrForProject.js |  64 +-
 ...-when-the-depedency-file-is-open-getErr.js |  32 +-
 ...depedency-file-is-open-geterrForProject.js |  48 +-
 ...solution-is-built-with-preserveSymlinks.js |  32 +-
 ...-and-has-index.ts-and-solution-is-built.js |  32 +-
 ...tion-is-not-built-with-preserveSymlinks.js |  32 +-
 ...-has-index.ts-and-solution-is-not-built.js |  32 +-
 ...solution-is-built-with-preserveSymlinks.js |  32 +-
 ...th-scoped-package-and-solution-is-built.js |  32 +-
 ...tion-is-not-built-with-preserveSymlinks.js |  32 +-
 ...coped-package-and-solution-is-not-built.js |  32 +-
 ...solution-is-built-with-preserveSymlinks.js |  32 +-
 ...le-from-subFolder-and-solution-is-built.js |  32 +-
 ...tion-is-not-built-with-preserveSymlinks.js |  32 +-
 ...rom-subFolder-and-solution-is-not-built.js |  32 +-
 ...solution-is-built-with-preserveSymlinks.js |  32 +-
 ...th-scoped-package-and-solution-is-built.js |  32 +-
 ...tion-is-not-built-with-preserveSymlinks.js |  32 +-
 ...coped-package-and-solution-is-not-built.js |  32 +-
 ...disableSourceOfProjectReferenceRedirect.js |  28 +-
 ...ect-when-referenced-project-is-not-open.js |  14 +-
 ...disableSourceOfProjectReferenceRedirect.js |  29 +-
 ...project-when-referenced-project-is-open.js |  15 +-
 ...ject-is-directly-referenced-by-solution.js |  16 +-
 ...ct-is-indirectly-referenced-by-solution.js |  16 +-
 ...ces-open-file-through-project-reference.js |  16 +-
 ...ct-is-indirectly-referenced-by-solution.js |  16 +-
 ...ts-have-allowJs-and-emitDeclarationOnly.js |  16 +-
 ...dts-changes-with-timeout-before-request.js |   6 +-
 ...Map-changes-with-timeout-before-request.js |   6 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   6 +-
 ...Map-changes-with-timeout-before-request.js |   6 +-
 ...rce-changes-with-timeout-before-request.js |   4 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   6 +-
 ...Map-changes-with-timeout-before-request.js |   6 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   7 +-
 ...Map-changes-with-timeout-before-request.js |   7 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   7 +-
 ...Map-changes-with-timeout-before-request.js |   7 +-
 ...rce-changes-with-timeout-before-request.js |   4 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   7 +-
 ...Map-changes-with-timeout-before-request.js |   7 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   6 +-
 ...Map-changes-with-timeout-before-request.js |   6 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   4 +-
 ...Map-changes-with-timeout-before-request.js |   4 +-
 ...rce-changes-with-timeout-before-request.js |   6 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...dts-changes-with-timeout-before-request.js |   6 +-
 ...Map-changes-with-timeout-before-request.js |   6 +-
 ...ile-changes-with-timeout-before-request.js |   4 +-
 ...-are-handled-correctly-on-watch-trigger.js |  10 +-
 ...iles-are-reflected-in-project-structure.js |   6 +-
 .../projects/config-file-is-deleted.js        |   5 +-
 .../deleted-files-affect-project-structure.js |   6 +-
 ...ith-typeAcquisition-when-safe-type-list.js |   3 +-
 ...directory-watch-invoke-on-file-creation.js |  82 +-
 ...issing-files-added-with-tripleslash-ref.js |   6 +-
 ...irectory-watch-invoke-on-open-file-save.js |   3 +-
 ...iles-excluded-from-a-configured-project.js |   6 +-
 .../projectsWithReferences/sample-project.js  |  18 +-
 ...es-with-deleting-referenced-config-file.js |  14 +-
 ...ing-transitively-referenced-config-file.js |  14 +-
 ...ces-with-edit-in-referenced-config-file.js |  12 +-
 ...ive-references-with-edit-on-config-file.js |  12 +-
 ...ansitive-references-with-non-local-edit.js |   6 +-
 ...es-with-deleting-referenced-config-file.js |  14 +-
 ...ing-transitively-referenced-config-file.js |  14 +-
 ...les-with-edit-in-referenced-config-file.js |  12 +-
 ...-without-files-with-edit-on-config-file.js |  12 +-
 ...ences-without-files-with-non-local-edit.js |   6 +-
 .../reloadProjects/configured-project.js      |   9 +-
 .../external-project-with-config-file.js      |   9 +-
 .../reloadProjects/external-project.js        |   9 +-
 .../reloadProjects/inferred-project.js        |   9 +-
 ...unnecessary-lookup-invalidation-on-save.js |   4 +-
 .../disable-suggestion-diagnostics.js         |  12 +-
 ...le-name-from-files-in-different-folders.js |   6 +-
 ...e-module-name-from-files-in-same-folder.js |   6 +-
 ...ative-module-name-from-inferred-project.js |   6 +-
 .../npm-install-@types-works.js               |  41 +-
 ...le-name-from-files-in-different-folders.js |   6 +-
 ...e-module-name-from-files-in-same-folder.js |   6 +-
 ...tore-the-states-for-configured-projects.js |  15 +-
 ...estore-the-states-for-inferred-projects.js |  19 +-
 ...hould-remove-the-module-not-found-error.js |   7 +-
 .../resolutionCache/suggestion-diagnostics.js |  18 +-
 .../suppressed-diagnostic-events.js           |   9 +-
 ...wild-card-directories-in-config-project.js |   6 +-
 .../closed-script-infos.js                    |   6 +-
 ...ectly-when-typings-are-added-or-removed.js |  14 +-
 ...tion-when-project-compiles-from-sources.js |  58 +-
 ...s-in-typings-folder-and-then-recompiles.js |  40 +-
 ...mpiles-after-deleting-generated-folders.js |  68 +-
 ...ping-when-project-compiles-from-sources.js |  58 +-
 ...s-in-typings-folder-and-then-recompiles.js |  46 +-
 ...mpiles-after-deleting-generated-folders.js |  74 +-
 ...emoved-and-added-with-different-content.js |  22 +-
 ...enceDirective-contains-UpperCasePackage.js |   6 +-
 ...ted-if-program-structure-did-not-change.js |   3 +-
 ...projects-discover-from-bower_components.js |   6 +-
 .../typingsInstaller/configured-projects.js   |   6 +-
 .../typingsInstaller/discover-from-bower.js   |   6 +-
 ...rom-node_modules-empty-types-has-import.js |   8 +-
 .../discover-from-node_modules-empty-types.js |   6 +-
 ...scover-from-node_modules-explicit-types.js |   6 +-
 .../discover-from-node_modules.js             |   6 +-
 .../typingsInstaller/expired-cache-entry.js   |   6 +-
 .../external-projects-no-type-acquisition.js  |   5 +-
 .../external-projects-type-acquisition.js     |   5 +-
 ...ith-disableFilenameBasedTypeAcquisition.js |   3 +-
 .../typingsInstaller/inferred-projects.js     |   6 +-
 .../install-typings-for-unresolved-imports.js |   8 +-
 ...date-the-resolutions-with-trimmed-names.js |  17 +-
 .../invalidate-the-resolutions.js             |  17 +-
 .../typingsInstaller/malformed-packagejson.js |   9 +-
 .../typingsInstaller/progress-notification.js |   6 +-
 ...utions-pointing-to-js-on-typing-install.js |   8 +-
 .../typingsInstaller/scoped-name-discovery.js |   8 +-
 .../should-handle-node-core-modules.js        |  20 +-
 .../typingsInstaller/telemetry-events.js      |   6 +-
 .../throttle-delayed-run-install-requests.js  |   6 +-
 .../throttle-delayed-typings-to-install.js    |   5 +-
 ...files-starting-with-dot-in-node_modules.js |  15 +-
 ...polling-when-file-is-added-to-subfolder.js |  10 +-
 ...rectory-when-file-is-added-to-subfolder.js |   7 +-
 ...tchFile-when-file-is-added-to-subfolder.js |   8 +-
 594 files changed, 6957 insertions(+), 2345 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 37efe3c7f5838..50e7076774c3b 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -286,7 +286,7 @@ function createDynamicPriorityPollingWatchFile(host: {
         return queue;
     }
 
-    function pollPollingIntervalQueue(queue: PollingIntervalQueue) {
+    function pollPollingIntervalQueue(_timeoutType: string, queue: PollingIntervalQueue) {
         queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
         // Set the next polling index and timeout
         if (queue.length) {
@@ -298,12 +298,12 @@ function createDynamicPriorityPollingWatchFile(host: {
         }
     }
 
-    function pollLowPollingIntervalQueue(queue: PollingIntervalQueue) {
+    function pollLowPollingIntervalQueue(_timeoutType: string, queue: PollingIntervalQueue) {
         // Always poll complete list of changedFilesInLastPoll
         pollQueue(changedFilesInLastPoll, PollingInterval.Low, /*pollIndex*/ 0, changedFilesInLastPoll.length);
 
         // Finally do the actual polling of the queue
-        pollPollingIntervalQueue(queue);
+        pollPollingIntervalQueue(_timeoutType, queue);
         // Schedule poll if there are files in changedFilesInLastPoll but no files in the actual queue
         // as pollPollingIntervalQueue wont schedule for next poll
         if (!queue.pollScheduled && changedFilesInLastPoll.length) {
@@ -374,7 +374,7 @@ function createDynamicPriorityPollingWatchFile(host: {
     }
 
     function scheduleNextPoll(pollingInterval: PollingInterval) {
-        pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === PollingInterval.Low ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+        pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === PollingInterval.Low ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === PollingInterval.Low ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
     }
 }
 
@@ -465,7 +465,7 @@ function createFixedChunkSizePollingWatchFile(host: {
 
     function scheduleNextPoll() {
         if (!watchedFiles.length || pollScheduled) return;
-        pollScheduled = host.setTimeout(pollQueue, PollingInterval.High);
+        pollScheduled = host.setTimeout(pollQueue, PollingInterval.High, "pollQueue");
     }
 }
 
@@ -713,7 +713,7 @@ function createDirectoryWatcherSupportingRecursive({
             clearTimeout(timerToUpdateChildWatches);
             timerToUpdateChildWatches = undefined;
         }
-        timerToUpdateChildWatches = setTimeout(onTimerToUpdateChildWatches, 1000);
+        timerToUpdateChildWatches = setTimeout(onTimerToUpdateChildWatches, 1000, "timerToUpdateChildWatches");
     }
 
     function onTimerToUpdateChildWatches() {
diff --git a/src/compiler/tsbuildPublic.ts b/src/compiler/tsbuildPublic.ts
index 3d0eda5ac0038..95668468d36f0 100644
--- a/src/compiler/tsbuildPublic.ts
+++ b/src/compiler/tsbuildPublic.ts
@@ -2258,10 +2258,10 @@ function scheduleBuildInvalidatedProject<T extends BuilderProgram>(state: Soluti
     if (state.timerToBuildInvalidatedProject) {
         hostWithWatch.clearTimeout(state.timerToBuildInvalidatedProject);
     }
-    state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
+    state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, "timerToBuildInvalidatedProject", state, changeDetected);
 }
 
-function buildNextInvalidatedProject<T extends BuilderProgram>(state: SolutionBuilderState<T>, changeDetected: boolean) {
+function buildNextInvalidatedProject<T extends BuilderProgram>(_timeoutType: string, state: SolutionBuilderState<T>, changeDetected: boolean) {
     performance.mark("SolutionBuilder::beforeBuild");
     const buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
     performance.mark("SolutionBuilder::afterBuild");
diff --git a/src/compiler/watchPublic.ts b/src/compiler/watchPublic.ts
index de98d499b7db6..fec0b5e34611b 100644
--- a/src/compiler/watchPublic.ts
+++ b/src/compiler/watchPublic.ts
@@ -803,7 +803,7 @@ export function createWatchProgram<T extends BuilderProgram>(host: WatchCompiler
         }
         const pending = clearInvalidateResolutionsOfFailedLookupLocations();
         writeLog(`Scheduling invalidateFailedLookup${pending ? ", Cancelled earlier one" : ""}`);
-        timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250);
+        timerToInvalidateFailedLookupResolutions = host.setTimeout(invalidateResolutionsOfFailedLookup, 250, "timerToInvalidateFailedLookupResolutions");
     }
 
     function invalidateResolutionsOfFailedLookup() {
@@ -825,7 +825,7 @@ export function createWatchProgram<T extends BuilderProgram>(host: WatchCompiler
             host.clearTimeout(timerToUpdateProgram);
         }
         writeLog("Scheduling update");
-        timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250);
+        timerToUpdateProgram = host.setTimeout(updateProgramWithWatchStatus, 250, "timerToUpdateProgram");
     }
 
     function scheduleProgramReload() {
diff --git a/src/server/session.ts b/src/server/session.ts
index 6d3e975d1f413..8245552034a39 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -329,8 +329,8 @@ export function formatMessage<T extends protocol.Message>(msg: T, logger: Logger
  * Allows to schedule next step in multistep operation
  */
 interface NextStep {
-    immediate(action: () => void): void;
-    delay(ms: number, action: () => void): void;
+    immediate(actionType: string, action: () => void): void;
+    delay(actionType: string, ms: number, action: () => void): void;
 }
 
 /**
@@ -371,22 +371,22 @@ class MultistepOperation implements NextStep {
         this.setImmediateId(undefined);
     }
 
-    public immediate(action: () => void) {
+    public immediate(actionType: string, action: () => void) {
         const requestId = this.requestId!;
         Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "immediate: incorrect request id");
         this.setImmediateId(this.operationHost.getServerHost().setImmediate(() => {
             this.immediateId = undefined;
             this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-        }));
+        }, actionType));
     }
 
-    public delay(ms: number, action: () => void) {
+    public delay(actionType: string, ms: number, action: () => void) {
         const requestId = this.requestId!;
         Debug.assert(requestId === this.operationHost.getCurrentRequestId(), "delay: incorrect request id");
         this.setTimerHandle(this.operationHost.getServerHost().setTimeout(() => {
             this.timerHandle = undefined;
             this.operationHost.executeWithRequestId(requestId, () => this.executeAction(action));
-        }, ms));
+        }, ms, actionType));
     }
 
     private executeAction(action: (next: NextStep) => void) {
@@ -1271,7 +1271,7 @@ export class Session<TMessage = string> implements EventSender {
         const goNext = () => {
             index++;
             if (checkList.length > index) {
-                next.delay(followMs, checkOne);
+                next.delay("checkOne", followMs, checkOne);
             }
         };
         const checkOne = () => {
@@ -1308,7 +1308,7 @@ export class Session<TMessage = string> implements EventSender {
                 goNext();
                 return;
             }
-            next.immediate(() => {
+            next.immediate("semanticCheck", () => {
                 this.semanticCheck(fileName, project);
                 if (this.changeSeq !== seq) {
                     return;
@@ -1318,7 +1318,7 @@ export class Session<TMessage = string> implements EventSender {
                     goNext();
                     return;
                 }
-                next.immediate(() => {
+                next.immediate("suggestionCheck", () => {
                     this.suggestionCheck(fileName, project);
                     goNext();
                 });
@@ -1326,7 +1326,7 @@ export class Session<TMessage = string> implements EventSender {
         };
 
         if (checkList.length > index && this.changeSeq === seq) {
-            next.delay(ms, checkOne);
+            next.delay("checkOne", ms, checkOne);
         }
     }
 
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index caf6cb46821ba..c9bd0ea1c6700 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -34,7 +34,7 @@ export class ThrottledOperations {
             this.host.clearTimeout(pendingTimeout);
         }
         // schedule new operation, pass arguments
-        this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, this, operationId, cb));
+        this.pendingTimeouts.set(operationId, this.host.setTimeout(ThrottledOperations.run, delay, operationId, this, cb));
         if (this.logger) {
             this.logger.info(`Scheduled: ${operationId}${pendingTimeout ? ", Cancelled earlier one" : ""}`);
         }
@@ -47,7 +47,7 @@ export class ThrottledOperations {
         return this.pendingTimeouts.delete(operationId);
     }
 
-    private static run(self: ThrottledOperations, operationId: string, cb: () => void) {
+    private static run(operationId: string, self: ThrottledOperations, cb: () => void) {
         perfLogger?.logStartScheduledOperation(operationId);
         self.pendingTimeouts.delete(operationId);
         if (self.logger) {
diff --git a/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts b/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts
index ebc3d3332d16e..03b91c2a39b63 100644
--- a/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts
+++ b/src/testRunner/unittests/tsbuildWatch/configFileErrors.ts
@@ -3,14 +3,9 @@ import { verifyTscWatch } from "../tscWatch/helpers";
 import {
     createWatchedSystem,
     libFile,
-    TestServerHost,
 } from "../virtualFileSystemWithWatch";
 
 describe("unittests:: tsbuildWatch:: watchMode:: configFileErrors:: reports syntax errors in config file", () => {
-    function build(sys: TestServerHost) {
-        sys.checkTimeoutQueueLengthAndRun(1); // build the project
-        sys.checkTimeoutQueueLength(0);
-    }
     verifyTscWatch({
         scenario: "configFileErrors",
         subScenario: "reports syntax errors in config file",
@@ -41,17 +36,17 @@ describe("unittests:: tsbuildWatch:: watchMode:: configFileErrors:: reports synt
                 caption: "reports syntax errors after change to config file",
                 edit: sys => sys.replaceFileText(`/user/username/projects/myproject/tsconfig.json`, ",", `,
         "declaration": true,`),
-                timeouts: build,
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build the project
             },
             {
                 caption: "reports syntax errors after change to ts file",
                 edit: sys => sys.replaceFileText(`/user/username/projects/myproject/a.ts`, "foo", "fooBar"),
-                timeouts: build,
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build the project
             },
             {
                 caption: "reports error when there is no change to tsconfig file",
                 edit: sys => sys.replaceFileText(`/user/username/projects/myproject/tsconfig.json`, "", ""),
-                timeouts: build,
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build the project
             },
             {
                 caption: "builds after fixing config file errors",
@@ -59,7 +54,7 @@ describe("unittests:: tsbuildWatch:: watchMode:: configFileErrors:: reports synt
                     compilerOptions: { composite: true, declaration: true },
                     files: ["a.ts", "b.ts"]
                 })),
-                timeouts: build,
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build the project
             }
         ]
     });
diff --git a/src/testRunner/unittests/tsbuildWatch/demo.ts b/src/testRunner/unittests/tsbuildWatch/demo.ts
index 2d0143acf6aee..8655b4c57d8c1 100644
--- a/src/testRunner/unittests/tsbuildWatch/demo.ts
+++ b/src/testRunner/unittests/tsbuildWatch/demo.ts
@@ -55,9 +55,8 @@ describe("unittests:: tsbuildWatch:: watchMode:: with demo project", () => {
                 caption: "Fix error",
                 edit: sys => sys.writeFile(coreFiles[0].path, coreFiles[0].content),
                 timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1); // build core
-                    sys.checkTimeoutQueueLengthAndRun(1); // build animals, zoo and solution
-                    sys.checkTimeoutQueueLength(0);
+                    sys.runQueuedTimeoutCallbacks(); // build core
+                    sys.runQueuedTimeoutCallbacks(); // build animals, zoo and solution
                 },
             }
         ]
@@ -80,10 +79,7 @@ ${coreFiles[1].content}`);
 import * as A from '../animals';
 ${coreFiles[1].content}`),
                 // build core
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
diff --git a/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts b/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts
index 457a627bc6d83..ef4541352f3a4 100644
--- a/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts
+++ b/src/testRunner/unittests/tsbuildWatch/moduleResolution.ts
@@ -50,10 +50,7 @@ describe("unittests:: tsbuildWatch:: watchMode:: moduleResolution", () => {
             {
                 caption: "Append text",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/project1/index.ts`, "const bar = 10;"),
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1); // build project1 and solution
-                    sys.checkTimeoutQueueLength(0);
-                }
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build project1 and solution
             },
         ]
     });
diff --git a/src/testRunner/unittests/tsbuildWatch/noEmit.ts b/src/testRunner/unittests/tsbuildWatch/noEmit.ts
index 10fd4fbe8fd7b..c980e67d230c0 100644
--- a/src/testRunner/unittests/tsbuildWatch/noEmit.ts
+++ b/src/testRunner/unittests/tsbuildWatch/noEmit.ts
@@ -24,19 +24,13 @@ describe("unittests:: tsbuildWatch:: watchMode:: with noEmit", () => {
                 caption: "No change",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/a.js`, sys.readFile(`/user/username/projects/myproject/a.js`)!),
                 // build project
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "change",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/a.js`, "const x = 10;"),
                 // build project
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ],
         baselineIncremental: true
diff --git a/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts b/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts
index ebe76b5d1f4e2..516ef2d6cc14e 100644
--- a/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts
+++ b/src/testRunner/unittests/tsbuildWatch/noEmitOnError.ts
@@ -15,10 +15,7 @@ describe("unittests:: tsbuildWatch:: watchMode:: with noEmitOnError", () => {
             caption,
             edit: sys => sys.writeFile(`/user/username/projects/noEmitOnError/src/main.ts`, content),
             // build project
-            timeouts: sys => {
-                sys.checkTimeoutQueueLengthAndRun(1);
-                sys.checkTimeoutQueueLength(0);
-            },
+            timeouts: sys => sys.runQueuedTimeoutCallbacks(),
         };
     }
 
@@ -26,10 +23,7 @@ describe("unittests:: tsbuildWatch:: watchMode:: with noEmitOnError", () => {
         caption: "No change",
         edit: sys => sys.writeFile(`/user/username/projects/noEmitOnError/src/main.ts`, sys.readFile(`/user/username/projects/noEmitOnError/src/main.ts`)!),
         // build project
-        timeouts: sys => {
-            sys.checkTimeoutQueueLengthAndRun(1);
-            sys.checkTimeoutQueueLength(0);
-        },
+        timeouts: sys => sys.runQueuedTimeoutCallbacks(),
     };
     verifyTscWatch({
         scenario: "noEmitOnError",
diff --git a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts
index 73e24456b9edc..608e27ce7cc4c 100644
--- a/src/testRunner/unittests/tsbuildWatch/programUpdates.ts
+++ b/src/testRunner/unittests/tsbuildWatch/programUpdates.ts
@@ -15,7 +15,6 @@ import {
     getTsBuildProjectFile,
     getTsBuildProjectFilePath,
     libFile,
-    TestServerHost,
 } from "../virtualFileSystemWithWatch";
 
 describe("unittests:: tsbuildWatch:: watchMode:: program updates", () => {
@@ -51,7 +50,7 @@ describe("unittests:: tsbuildWatch:: watchMode:: program updates", () => {
         return {
             caption,
             edit: sys => sys.writeFile(ts.isString(fileName) ? fileName : fileName(), ts.isString(content) ? content : content()),
-            timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Builds core
+            timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Builds core
         };
     }
 
@@ -116,10 +115,7 @@ describe("unittests:: tsbuildWatch:: watchMode:: program updates", () => {
             const buildLogicAndTests: TscWatchCompileChange = {
                 caption: "Build logic and tests",
                 edit: ts.noop,
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             };
 
             verifyTscWatch({
@@ -148,7 +144,7 @@ export class someClass { }`;
                             sys.writeFile(core[1].path, `${change1}
 export class someClass2 { }`);
                         },
-                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Builds core
+                        timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Builds core
                     },
                     buildLogicAndTests,
                 ]
@@ -226,16 +222,13 @@ export class someClass2 { }`),
             {
                 caption: "Write logic tsconfig and build logic",
                 edit: sys => sys.writeFile(logic[0].path, logic[0].content),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Builds logic
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Builds logic
             },
             {
                 caption: "Build Tests",
                 edit: ts.noop,
                 // Build tests
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -255,10 +248,7 @@ export class someClass2 { }`),
             caption: "Build logic",
             edit: ts.noop,
             // Builds logic
-            timeouts: sys => {
-                sys.checkTimeoutQueueLengthAndRun(1);
-                sys.checkTimeoutQueueLength(0);
-            },
+            timeouts: sys => sys.runQueuedTimeoutCallbacks(),
         };
         verifyTscWatch({
             scenario: "programUpdates",
@@ -341,8 +331,8 @@ createSomeObject().message;`
                     // Change message in library to message2
                     edit: sys => sys.writeFile(libraryTs.path, libraryTs.content.replace(/message/g, "message2")),
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1); // Build library
-                        sys.checkTimeoutQueueLengthAndRun(1); // Build App
+                        sys.runQueuedTimeoutCallbacks(); // Build library
+                        sys.runQueuedTimeoutCallbacks(); // Build App
                     },
                 },
                 {
@@ -350,8 +340,8 @@ createSomeObject().message;`
                     // Revert library changes
                     edit: sys => sys.writeFile(libraryTs.path, libraryTs.content),
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1); // Build library
-                        sys.checkTimeoutQueueLengthAndRun(1); // Build App
+                        sys.runQueuedTimeoutCallbacks(); // Build library
+                        sys.runQueuedTimeoutCallbacks(); // Build App
                     },
                 },
             ]
@@ -372,20 +362,14 @@ createSomeObject().message;`
                         edit: sys => sys.writeFile(logic[1].path, `${logic[1].content}
 let y: string = 10;`),
                         // Builds logic
-                        timeouts: sys => {
-                            sys.checkTimeoutQueueLengthAndRun(1);
-                            sys.checkTimeoutQueueLength(0);
-                        },
+                        timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                     },
                     {
                         caption: "change core",
                         edit: sys => sys.writeFile(core[1].path, `${core[1].content}
 let x: string = 10;`),
                         // Builds core
-                        timeouts: sys => {
-                            sys.checkTimeoutQueueLengthAndRun(1);
-                            sys.checkTimeoutQueueLength(0);
-                        },
+                        timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                     }
                 ]
             });
@@ -417,22 +401,17 @@ let x: string = 10;`),
                 content: JSON.stringify({ compilerOptions: { composite: true } })
             };
 
-            function incrementalBuild(sys: TestServerHost) {
-                sys.checkTimeoutQueueLengthAndRun(1); // Build the app
-                sys.checkTimeoutQueueLength(0);
-            }
-
             const fixError: TscWatchCompileChange = {
                 caption: "Fix error in fileWithError",
                 // Fix error
                 edit: sys => sys.writeFile(fileWithError.path, fileWithFixedError.content),
-                timeouts: incrementalBuild
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             };
 
             const changeFileWithoutError: TscWatchCompileChange = {
                 caption: "Change fileWithoutError",
                 edit: sys => sys.writeFile(fileWithoutError.path, fileWithoutError.content.replace(/myClass/g, "myClass2")),
-                timeouts: incrementalBuild
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             };
 
             verifyTscWatch({
@@ -465,7 +444,7 @@ let x: string = 10;`),
                 const introduceError: TscWatchCompileChange = {
                     caption: "Introduce error",
                     edit: sys => sys.writeFile(fileWithError.path, fileWithError.content),
-                    timeouts: incrementalBuild,
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 };
 
                 verifyTscWatch({
@@ -509,18 +488,15 @@ let x: string = 10;`),
                 caption: "Make non dts change",
                 edit: sys => sys.writeFile(logic[1].path, `${logic[1].content}
 function someFn() { }`),
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1); // build logic and updates tests
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build logic and updates tests
             },
             {
                 caption: "Make dts change",
                 edit: sys => sys.writeFile(logic[1].path, `${logic[1].content}
 export function someFn() { }`),
                 timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1); // build logic
-                    sys.checkTimeoutQueueLengthAndRun(1); // build tests
+                    sys.runQueuedTimeoutCallbacks(); // build logic
+                    sys.runQueuedTimeoutCallbacks(); // build tests
                 },
             }
         ],
@@ -568,7 +544,7 @@ export function someFn() { }`),
             {
                 caption: "Add new file",
                 edit: sys => sys.writeFile(`sample1/${SubProject.core}/file3.ts`, `export const y = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             noopChange,
         ]
@@ -588,7 +564,7 @@ export function someFn() { }`),
             {
                 caption: "Add new file",
                 edit: sys => sys.writeFile(`sample1/${SubProject.core}/file3.ts`, `export const y = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             noopChange
         ]
@@ -684,15 +660,12 @@ export function someFn() { }`),
                 edit: sys => sys.writeFile("/a/b/alpha.tsconfig.json", JSON.stringify({
                     compilerOptions: { strict: true }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build project1
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build project1
             },
             {
                 caption: "Build project 2",
                 edit: ts.noop,
-                timeouts: sys => { // Build project2
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project2
             },
             {
                 caption: "change bravo config",
@@ -700,43 +673,31 @@ export function someFn() { }`),
                     extends: "./alpha.tsconfig.json",
                     compilerOptions: { strict: false }
                 })),
-                timeouts: sys => { // Build project2
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project2
             },
             {
                 caption: "project 2 extends alpha",
                 edit: sys => sys.writeFile("/a/b/project2.tsconfig.json", JSON.stringify({
                     extends: "./alpha.tsconfig.json",
                 })),
-                timeouts: sys => { // Build project2
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project2
             },
             {
                 caption: "update aplha config",
                 edit: sys => sys.writeFile("/a/b/alpha.tsconfig.json", "{}"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // build project1
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // build project1
             },
             {
                 caption: "Build project 2",
                 edit: ts.noop,
-                timeouts: sys => { // Build project2
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project3
             },
             {
                 caption: "Modify extendsConfigFile2",
                 edit: sys => sys.writeFile("/a/b/extendsConfig2.tsconfig.json", JSON.stringify({
                     compilerOptions: { strictNullChecks: true }
                 })),
-                timeouts: sys => { // Build project3
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project3
             },
             {
                 caption: "Modify project 3",
@@ -745,18 +706,12 @@ export function someFn() { }`),
                     compilerOptions: { composite: false },
                     files: ["/a/b/other2.ts"]
                 })),
-                timeouts: sys => { // Build project3
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project3
             },
             {
                 caption: "Delete extendedConfigFile2 and report error",
                 edit: sys => sys.deleteFile("./extendsConfig2.tsconfig.json"),
-                timeouts: sys => { // Build project3
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build project3
             }
         ],
     });
@@ -837,10 +792,7 @@ export function someFn() { }`),
                     ],
                     files: [],
                 })),
-                timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1);
-                    sys.checkTimeoutQueueLength(0);
-                },
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
diff --git a/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts b/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts
index 36e619f342f6c..44fc16c151845 100644
--- a/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts
+++ b/src/testRunner/unittests/tsbuildWatch/projectsBuilding.ts
@@ -51,7 +51,7 @@ describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => {
         return {
             caption: `build ${pkgs(index => `pkg${index}`, count, startIndex).join(",")}`,
             edit: ts.noop,
-            timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+            timeouts: sys => sys.runQueuedTimeoutCallbacks(),
         };
     }
     verifyTscWatch({
@@ -66,13 +66,13 @@ describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => {
             {
                 caption: "dts doesn't change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `const someConst2 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Build pkg0 and update timestamps
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build pkg0 and update timestamps
             },
             noopChange,
             {
                 caption: "dts change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `export const someConst = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(1, 2),
             noopChange,
@@ -90,13 +90,13 @@ describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => {
             {
                 caption: "dts doesn't change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `const someConst2 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Build pkg0 and update timestamps
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build pkg0 and update timestamps
             },
             noopChange,
             {
                 caption: "dts change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `export const someConst = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(1, 4),
             noopChange,
@@ -114,13 +114,13 @@ describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => {
             {
                 caption: "dts doesn't change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `const someConst2 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Build pkg0 and update timestamps
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build pkg0 and update timestamps
             },
             noopChange,
             {
                 caption: "dts change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `export const someConst = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(1, 5),
             checkBuildPkg(6, 2),
@@ -128,13 +128,13 @@ describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => {
             {
                 caption: "dts change2",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `export const someConst3 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(1, 5),
             {
                 caption: "change while building",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `const someConst4 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(6, 2),
             noopChange,
@@ -152,13 +152,13 @@ describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => {
             {
                 caption: "dts doesn't change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `const someConst2 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Build pkg0 and update timestamps
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Build pkg0 and update timestamps
             },
             noopChange,
             {
                 caption: "dts change",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `export const someConst = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(1, 5),
             checkBuildPkg(6, 5),
@@ -169,20 +169,20 @@ describe("unittests:: tsbuildWatch:: watchMode:: projectsBuilding", () => {
             {
                 caption: "dts change2",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `export const someConst3 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(1, 5),
             checkBuildPkg(6, 5),
             {
                 caption: "change while building",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `const someConst4 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(11, 5),
             {
                 caption: "change while building: dts changes",
                 edit: sys => sys.appendFile(`/user/username/projects/myproject/pkg0/index.ts`, `export const someConst5 = 10;`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1) // Build pkg0
+                timeouts: sys => sys.runQueuedTimeoutCallbacks() // Build pkg0
             },
             checkBuildPkg(1, 5),
             checkBuildPkg(6, 5),
diff --git a/src/testRunner/unittests/tsbuildWatch/publicApi.ts b/src/testRunner/unittests/tsbuildWatch/publicApi.ts
index 5bd78b019831b..4100665541792 100644
--- a/src/testRunner/unittests/tsbuildWatch/publicApi.ts
+++ b/src/testRunner/unittests/tsbuildWatch/publicApi.ts
@@ -69,9 +69,8 @@ export function f22() { } // trailing`
                 caption: "change to shared",
                 edit: sys => sys.prependFile(sharedIndex.path, "export function fooBar() {}"),
                 timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1); // Shared
-                    sys.checkTimeoutQueueLengthAndRun(1); // webpack and solution
-                    sys.checkTimeoutQueueLength(0);
+                    sys.runQueuedTimeoutCallbacks(); // Shared
+                    sys.runQueuedTimeoutCallbacks(); // webpack and solution
                 }
             }
         ],
diff --git a/src/testRunner/unittests/tsbuildWatch/reexport.ts b/src/testRunner/unittests/tsbuildWatch/reexport.ts
index d6248d4e3b47d..4943ca8fde93e 100644
--- a/src/testRunner/unittests/tsbuildWatch/reexport.ts
+++ b/src/testRunner/unittests/tsbuildWatch/reexport.ts
@@ -28,18 +28,16 @@ describe("unittests:: tsbuildWatch:: watchMode:: with reexport when referenced p
                 caption: "Introduce error",
                 edit: sys => sys.replaceFileText(`/user/username/projects/reexport/src/pure/session.ts`, "// ", ""),
                 timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1); // build src/pure
-                    sys.checkTimeoutQueueLengthAndRun(1); // build src/main and src
-                    sys.checkTimeoutQueueLength(0);
+                    sys.runQueuedTimeoutCallbacks(); // build src/pure
+                    sys.runQueuedTimeoutCallbacks(); // build src/main and src
                 },
             },
             {
                 caption: "Fix error",
                 edit: sys => sys.replaceFileText(`/user/username/projects/reexport/src/pure/session.ts`, "bar: ", "// bar: "),
                 timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(1); // build src/pure
-                    sys.checkTimeoutQueueLengthAndRun(1); // build src/main and src
-                    sys.checkTimeoutQueueLength(0);
+                    sys.runQueuedTimeoutCallbacks(); // build src/pure
+                    sys.runQueuedTimeoutCallbacks(); // build src/main and src
                 },
             }
         ]
diff --git a/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts b/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts
index 18bcab878ba5e..792a1f9ff4850 100644
--- a/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tsbuildWatch/watchEnvironment.ts
@@ -41,9 +41,8 @@ describe("unittests:: tsbuildWatch:: watchEnvironment:: tsbuild:: watchMode:: wi
                     caption: "modify typing file",
                     edit: sys => sys.writeFile(typing.path, `${typing.content}export const typing1 = 10;`),
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1);
-                        sys.checkTimeoutQueueLengthAndRun(1);
-                        sys.checkTimeoutQueueLength(0);
+                        sys.runQueuedTimeoutCallbacks();
+                        sys.runQueuedTimeoutCallbacks();
                     }
                 },
                 {
@@ -53,15 +52,14 @@ describe("unittests:: tsbuildWatch:: watchEnvironment:: tsbuild:: watchMode:: wi
                         maxPkgs--;
                         writePkgReferences(sys);
                     },
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "modify typing file",
                     edit: sys => sys.writeFile(typing.path, typing.content),
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1);
-                        sys.checkTimeoutQueueLengthAndRun(1);
-                        sys.checkTimeoutQueueLength(0);
+                        sys.runQueuedTimeoutCallbacks();
+                        sys.runQueuedTimeoutCallbacks();
                     }
                 },
                 {
@@ -71,12 +69,12 @@ describe("unittests:: tsbuildWatch:: watchEnvironment:: tsbuild:: watchMode:: wi
                         maxPkgs = 0;
                         writePkgReferences(sys);
                     },
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "modify typing file",
                     edit: sys => sys.writeFile(typing.path, `${typing.content}export const typing1 = 10;`),
-                    timeouts: sys => sys.checkTimeoutQueueLength(0),
+                    timeouts: sys => sys.logTimeoutQueueLength(),
                 },
             ],
             watchOrSolution: solutionBuilder
diff --git a/src/testRunner/unittests/tscWatch/emit.ts b/src/testRunner/unittests/tscWatch/emit.ts
index 9cf3434477d56..f5333a56fe31b 100644
--- a/src/testRunner/unittests/tscWatch/emit.ts
+++ b/src/testRunner/unittests/tscWatch/emit.ts
@@ -154,7 +154,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
     const changeModuleFile1Shape: TscWatchCompileChange = {
         caption: "Change the content of moduleFile1 to `export var T: number;export function Foo() { };`",
         edit: modifyModuleFile1Shape,
-        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+        timeouts: sys => sys.runQueuedTimeoutCallbacks(),
     };
 
     verifyTscWatchEmit({
@@ -164,7 +164,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
             {
                 caption: "Change the content of moduleFile1 to `export var T: number;export function Foo() { console.log('hi'); };`",
                 edit: sys => sys.writeFile(moduleFile1Path, `export var T: number;export function Foo() { console.log('hi'); };`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -175,18 +175,18 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
             {
                 caption: "Change file1Consumer1 content to `export let y = Foo();`",
                 edit: sys => sys.writeFile(file1Consumer1Path, `export let y = Foo();`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             changeModuleFile1Shape,
             {
                 caption: "Add the import statements back to file1Consumer1",
                 edit: sys => sys.writeFile(file1Consumer1Path, `import {Foo} from "./moduleFile1";let y = Foo();`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Change the content of moduleFile1 to `export var T: number;export var T2: string;export function Foo() { };`",
                 edit: sys => sys.writeFile(moduleFile1Path, `export let y = Foo();`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Multiple file edits in one go",
@@ -196,7 +196,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
                     sys.writeFile(file1Consumer1Path, `import {Foo} from "./moduleFile1";let y = Foo();`);
                     modifyModuleFile1Shape(sys);
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -210,7 +210,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
                     modifyModuleFile1Shape(sys);
                     sys.deleteFile(file1Consumer2Path);
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -224,7 +224,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
                     sys.writeFile("/a/b/file1Consumer3.ts", `import {Foo} from "./moduleFile1"; let y = Foo();`);
                     modifyModuleFile1Shape(sys);
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -237,7 +237,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
             {
                 caption: "change file1 internal, and verify only file1 is affected",
                 edit: sys => sys.appendFile(moduleFile1Path, "var T1: number;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -248,7 +248,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
             {
                 caption: "change shape of global file",
                 edit: sys => sys.appendFile(globalFilePath, "var T2: string;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -279,7 +279,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
             {
                 caption: "change file1Consumer1",
                 edit: sys => sys.appendFile(file1Consumer1Path, "export var T: number;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             changeModuleFile1Shape,
             {
@@ -288,7 +288,7 @@ describe("unittests:: tsc-watch:: emit for configured projects", () => {
                     sys.appendFile(file1Consumer1Path, "export var T2: number;");
                     sys.writeFile(moduleFile1Path, `export var T2: number;export function Foo() { };`);
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -312,7 +312,7 @@ export var t2 = 10;`
             {
                 caption: "change file1",
                 edit: sys => sys.appendFile("/a/b/file1.ts", "export var t3 = 10;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -329,7 +329,7 @@ export var x = Foo();`
             {
                 caption: "delete moduleFile1",
                 edit: sys => sys.deleteFile(moduleFile1Path),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -346,12 +346,12 @@ export var x = Foo();`
             {
                 caption: "edit refereceFile1",
                 edit: sys => sys.appendFile("/a/b/referenceFile1.ts", "export var yy = Foo();"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "create moduleFile2",
                 edit: sys => sys.writeFile(moduleFile2Path, "export var Foo4 = 10;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -377,7 +377,7 @@ describe("unittests:: tsc-watch:: emit file content", () => {
                 {
                     caption: "Append a line",
                     edit: sys => sys.appendFile("/a/app.ts", newLine + "var z = 3;"),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 }
             ],
         });
@@ -415,12 +415,12 @@ describe("unittests:: tsc-watch:: emit file content", () => {
             {
                 caption: "Append content to f1",
                 edit: sys => sys.appendFile("/a/b/f1.ts", "export function foo2() { return 2; }"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Again Append content to f1",
                 edit: sys => sys.appendFile("/a/b/f1.ts", "export function fooN() { return 2; }"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ],
     });
@@ -449,7 +449,7 @@ describe("unittests:: tsc-watch:: emit file content", () => {
             {
                 caption: "Append content to file3",
                 edit: sys => sys.appendFile("/user/someone/projects/myproject/file3.ts", "function foo2() { return 2; }"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ],
     });
@@ -479,7 +479,7 @@ describe("unittests:: tsc-watch:: emit file content", () => {
             {
                 caption: "file is deleted and then created to modify content",
                 edit: sys => sys.appendFile("/home/username/project/app/file.ts", "\nvar b = 10;", { invokeFileDeleteCreateAsPartInsteadOfChange: true }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
diff --git a/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts b/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts
index 5a3c520602e37..8558bd3367dd2 100644
--- a/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts
+++ b/src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts
@@ -350,14 +350,14 @@ export class Data2 {
                 caption,
                 edit: sys => sys.writeFile(`/user/username/projects/noEmitOnError/src/main.ts`, content),
                 // build project
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             };
         }
         const noChange: TscWatchCompileChange = {
             caption: "No change",
             edit: sys => sys.writeFile(`/user/username/projects/noEmitOnError/src/main.ts`, sys.readFile(`/user/username/projects/noEmitOnError/src/main.ts`)!),
             // build project
-            timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+            timeouts: sys => sys.runQueuedTimeoutCallbacks(),
         };
         verifyEmitAndErrorUpdates({
             subScenario: "with noEmitOnError",
diff --git a/src/testRunner/unittests/tscWatch/helpers.ts b/src/testRunner/unittests/tscWatch/helpers.ts
index 7b6b1d49b8132..e864b976277ba 100644
--- a/src/testRunner/unittests/tscWatch/helpers.ts
+++ b/src/testRunner/unittests/tscWatch/helpers.ts
@@ -32,9 +32,9 @@ export const commonFile2: File = {
 export type WatchOrSolution<T extends ts.BuilderProgram> = void | ts.SolutionBuilder<T> | ts.WatchOfConfigFile<T> | ts.WatchOfFilesAndCompilerOptions<T>;
 export interface TscWatchCompileChange<T extends ts.BuilderProgram = ts.EmitAndSemanticDiagnosticsBuilderProgram> {
     caption: string;
-    edit: (sys: TestServerHostTrackingWrittenFiles) => void;
+    edit: (sys: TscWatchSystem) => void;
     timeouts: (
-        sys: TestServerHostTrackingWrittenFiles,
+        sys: TscWatchSystem,
         programs: readonly CommandLineProgram[],
         watchOrSolution: WatchOrSolution<T>
     ) => void;
@@ -56,7 +56,7 @@ export interface TscWatchCompile extends TscWatchCompileBase {
 export const noopChange: TscWatchCompileChange = {
     caption: "No change",
     edit: ts.noop,
-    timeouts: sys => sys.checkTimeoutQueueLength(0),
+    timeouts: sys => sys.logTimeoutQueueLength(),
 };
 
 export type SystemSnap = ReturnType<TestServerHost["snap"]>;
@@ -92,9 +92,43 @@ function tscWatchCompile(input: TscWatchCompile) {
     });
 }
 
+export interface TestServerHostWithTimeoutLogging {
+    logTimeoutQueueLength(): void;
+}
+
+export type TscWatchSystem = TestServerHostTrackingWrittenFiles & TestServerHostWithTimeoutLogging;
+
+function changeToTestServerHostWithTimeoutLogging(inputHost: TestServerHostTrackingWrittenFiles, baseline: string[]): TscWatchSystem {
+    const host = inputHost as TscWatchSystem;
+    const originalRunQueuedTimeoutCallbacks = host.runQueuedTimeoutCallbacks;
+    const originalRunQueuedImmediateCallbacks = host.runQueuedImmediateCallbacks;
+    host.runQueuedTimeoutCallbacks = runQueuedTimeoutCallbacks;
+    host.runQueuedImmediateCallbacks = runQueuedImmediateCallbacks;
+    host.logTimeoutQueueLength = logTimeoutQueueLength;
+    return host;
+
+    function logTimeoutQueueLength() {
+        baseline.push(host.timeoutCallbacks.log());
+        baseline.push(host.immediateCallbacks.log());
+    }
+
+    function runQueuedTimeoutCallbacks(timeoutId?: number) {
+        baseline.push(`Before running ${host.timeoutCallbacks.log()}`);
+        if (timeoutId !== undefined) baseline.push(`Invoking ${host.timeoutCallbacks.callbackType} callback:: timeoutId:: ${timeoutId}:: ${host.timeoutCallbacks.map[timeoutId].args[0]}`);
+        originalRunQueuedTimeoutCallbacks.call(host, timeoutId);
+        baseline.push(`After running ${host.timeoutCallbacks.log()}`);
+    }
+
+    function runQueuedImmediateCallbacks() {
+        baseline.push(`Before running ${host.immediateCallbacks.log()}`);
+        originalRunQueuedImmediateCallbacks.call(host);
+        baseline.push(`After running ${host.immediateCallbacks.log()}`);
+    }
+}
+
 export interface BaselineBase {
     baseline: string[];
-    sys: TestServerHostTrackingWrittenFiles;
+    sys: TscWatchSystem;
     oldSnap: SystemSnap;
 }
 
@@ -105,8 +139,8 @@ export function createBaseline(system: TestServerHost, modifySystem?: (sys: Test
     const originalRead = system.readFile;
     const initialSys = patchHostForBuildInfoReadWrite(system);
     modifySystem?.(initialSys, originalRead);
-    const sys = changeToHostTrackingWrittenFiles(initialSys);
     const baseline: string[] = [];
+    const sys = changeToTestServerHostWithTimeoutLogging(changeToHostTrackingWrittenFiles(initialSys), baseline);
     baseline.push(`currentDirectory:: ${sys.getCurrentDirectory()} useCaseSensitiveFileNames: ${sys.useCaseSensitiveFileNames}`);
     baseline.push("Input::");
     sys.diff(baseline);
@@ -179,7 +213,7 @@ export function applyEdit(sys: BaselineBase["sys"], baseline: BaselineBase["base
 }
 
 export interface RunWatchBaseline<T extends ts.BuilderProgram> extends BaselineBase, TscWatchCompileBase<T> {
-    sys: TestServerHostTrackingWrittenFiles;
+    sys: TscWatchSystem;
     getPrograms: () => readonly CommandLineProgram[];
     watchOrSolution: WatchOrSolution<T>;
 }
diff --git a/src/testRunner/unittests/tscWatch/programUpdates.ts b/src/testRunner/unittests/tscWatch/programUpdates.ts
index 5aaa8e4af9a48..b2d8e4f0c3eaf 100644
--- a/src/testRunner/unittests/tscWatch/programUpdates.ts
+++ b/src/testRunner/unittests/tscWatch/programUpdates.ts
@@ -110,7 +110,7 @@ describe("unittests:: tsc-watch:: program updates", () => {
             {
                 caption: "Create commonFile2",
                 edit: sys => sys.writeFile(commonFile2.path, commonFile2.content),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -145,17 +145,17 @@ describe("unittests:: tsc-watch:: program updates", () => {
             {
                 caption: "change file to ensure signatures are updated",
                 edit: sys => sys.appendFile(commonFile2.path, ";let xy = 10;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "delete file2",
                 edit: sys => sys.deleteFile(commonFile2.path),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "recreate file2",
                 edit: sys => sys.writeFile(commonFile2.path, commonFile2.content),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -176,7 +176,7 @@ describe("unittests:: tsc-watch:: program updates", () => {
             {
                 caption: "create file2",
                 edit: sys => sys.writeFile(commonFile2.path, commonFile2.content),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -199,7 +199,7 @@ describe("unittests:: tsc-watch:: program updates", () => {
             {
                 caption: "change file to ensure signatures are updated",
                 edit: sys => sys.appendFile(commonFile2.path, ";let xy = 10;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Change config",
@@ -207,7 +207,7 @@ describe("unittests:: tsc-watch:: program updates", () => {
                         "compilerOptions": {},
                         "files": ["${commonFile1.path}"]
                     }`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -233,7 +233,7 @@ describe("unittests:: tsc-watch:: program updates", () => {
                         "compilerOptions": {},
                         "files": ["${commonFile1.path}", "${commonFile2.path}"]
                     }`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -261,14 +261,14 @@ describe("unittests:: tsc-watch:: program updates", () => {
                 edit: sys => sys.modifyFile("/tsconfig.json", JSON.stringify({
                     compilerOptions: { allowUnusedLabels: false }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Enable  allowUnsusedLabels",
                 edit: sys => sys.modifyFile("/tsconfig.json", JSON.stringify({
                     compilerOptions: { allowUnusedLabels: true }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -302,7 +302,7 @@ describe("unittests:: tsc-watch:: program updates", () => {
                     compilerOptions: { allowArbitraryExtensions: false },
                     files: ["/a.ts"],
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Enable  allowArbitraryExtensions",
@@ -310,7 +310,7 @@ describe("unittests:: tsc-watch:: program updates", () => {
                     compilerOptions: { allowArbitraryExtensions: true },
                     files: ["/a.ts"],
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -346,7 +346,7 @@ export class A {
                 edit: sys => sys.modifyFile("/tsconfig.json", JSON.stringify({
                     compilerOptions: { target: "es6", importsNotUsedAsValues: "error", experimentalDecorators: true }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
 
             },
             {
@@ -354,7 +354,7 @@ export class A {
                 edit: sys => sys.modifyFile("/tsconfig.json", JSON.stringify({
                     compilerOptions: { target: "es6", importsNotUsedAsValues: "error", experimentalDecorators: true, emitDecoratorMetadata: true }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -416,7 +416,7 @@ export class A {
                         },
                         "files": ["/a/b/file1.ts"]
                     }`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -464,7 +464,7 @@ export class A {
                 caption: "Modify f2 to include f3",
                 // now inferred project should inclule file3
                 edit: sys => sys.modifyFile("/a/b/f2.ts", `export * from "../c/f3"`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -492,7 +492,7 @@ export class A {
             {
                 caption: "Delete f2",
                 edit: sys => sys.deleteFile("/a/b/f2.ts"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -520,7 +520,7 @@ export class A {
             {
                 caption: "Delete f2",
                 edit: sys => sys.deleteFile("/a/b/f2.ts"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -563,7 +563,7 @@ export class A {
         },
         edits: [{
             caption: "change `module` to 'none'",
-            timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+            timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             edit: sys => {
                 sys.writeFile(configFilePath, JSON.stringify({ compilerOptions: { module: "none" } }));
             }
@@ -621,7 +621,7 @@ export class A {
             oldSnap: oldSnap2,
         });
 
-        sys.checkTimeoutQueueLength(0);
+        sys.logTimeoutQueueLength();
         baseline.push(`First program is not updated:: ${getPrograms() === ts.emptyArray}`);
         baseline.push(`Second program is not updated:: ${getPrograms2() === ts.emptyArray}`);
         Harness.Baseline.runBaseline(`tscWatch/${scenario}/two-watch-programs-are-not-affected-by-each-other.js`, baseline.join("\r\n"));
@@ -642,7 +642,7 @@ export class A {
             {
                 caption: "Write f2",
                 edit: sys => sys.writeFile("/a/b/f2.ts", "let y = 1"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -670,7 +670,7 @@ export class A {
             {
                 caption: "Modify config to make f2 as root too",
                 edit: sys => sys.writeFile(configFilePath, JSON.stringify({ compilerOptions: {}, files: ["f1.ts", "f2.ts"] })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -698,12 +698,12 @@ export class A {
             {
                 caption: "Add new file",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/new-file.ts`, "export const z = 1;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Import new file",
                 edit: sys => sys.prependFile(`/user/username/projects/myproject/f1.ts`, `import { z } from "./new-file";`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -727,7 +727,7 @@ export class A {
             {
                 caption: "Write file2",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/Project/file2.ts`, "export const y = 10;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             }
         ]
     });
@@ -755,7 +755,7 @@ export class A {
             {
                 caption: "Modify config to set outFile option",
                 edit: sys => sys.writeFile(configFilePath, JSON.stringify({ compilerOptions: { outFile: "out.js" }, files: ["f1.ts", "f2.ts"] })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -783,7 +783,7 @@ export class A {
             {
                 caption: "Delete f2",
                 edit: sys => sys.deleteFile("/a/b/f2.ts"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -807,7 +807,7 @@ export class A {
             {
                 caption: "Delete config file",
                 edit: sys => sys.deleteFile(configFilePath),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -881,7 +881,7 @@ declare const eval: any`
                         }
                     })
                 ),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }
         ]
     });
@@ -1234,7 +1234,7 @@ declare const eval: any`
                     {
                         caption: "Add new file",
                         edit: sys => sys.writeFile(`/user/username/projects/myproject/src/file3.ts`, `export const y = 10;`),
-                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2), // To update program and failed lookups
+                        timeouts: sys => sys.runQueuedTimeoutCallbacks(), // To update program and failed lookups
                     },
                     noopChange,
                 ]
@@ -1843,7 +1843,7 @@ import { x } from "../b";`),
                     compilerOptions: {},
                     files: [commonFile1.path, commonFile2.path]
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Change first extended config",
@@ -1852,7 +1852,7 @@ import { x } from "../b";`),
                         strict: false,
                     }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Change second extended config",
@@ -1862,7 +1862,7 @@ import { x } from "../b";`),
                         strictNullChecks: true,
                     }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Change config to stop extending another config",
@@ -1870,7 +1870,7 @@ import { x } from "../b";`),
                     compilerOptions: {},
                     files: [commonFile1.path, commonFile2.path]
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ]
     });
@@ -1908,7 +1908,7 @@ import { x } from "../b";`),
             {
                 caption: "Add module3 to folder2",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/client/linktofolder2/module3.ts`, `import * as M from "folder1/module1";`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ]
     });
@@ -1959,27 +1959,27 @@ import { x } from "../b";`),
             {
                 caption: "Add class3 to project1",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.ts`, `class class3 {}`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Add output of class3",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.d.ts`, `declare class class3 {}`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Add excluded file to project1",
                 edit: sys => sys.ensureFileOrFolder({ path: `/user/username/projects/myproject/projects/project1/temp/file.d.ts`, content: `declare class file {}` }),
-                timeouts: sys => sys.checkTimeoutQueueLength(0),
+                timeouts: sys => sys.logTimeoutQueueLength(),
             },
             {
                 caption: "Delete output of class3",
                 edit: sys => sys.deleteFile(`/user/username/projects/myproject/projects/project1/class3.d.ts`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Add output of class3",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.d.ts`, `declare class class3 {}`),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ]
     });
@@ -2003,7 +2003,7 @@ import { x } from "../b";`),
             {
                 caption: "Create foo in project root",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/foo`, ``),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ]
     });
@@ -2041,7 +2041,7 @@ import { x } from "../b";`),
                         allowImportingTsExtensions: true
                     }
                 })),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ]
     });
diff --git a/src/testRunner/unittests/tscWatch/projectsWithReferences.ts b/src/testRunner/unittests/tscWatch/projectsWithReferences.ts
index fc2cc62640988..a1c51072281dc 100644
--- a/src/testRunner/unittests/tscWatch/projectsWithReferences.ts
+++ b/src/testRunner/unittests/tscWatch/projectsWithReferences.ts
@@ -40,7 +40,7 @@ describe("unittests:: tsc-watch:: projects with references: invoking when refere
                 },
                 // not ideal, but currently because of d.ts but no new file is written
                 // There will be timeout queued even though file contents are same
-                timeouts: sys => sys.checkTimeoutQueueLength(0),
+                timeouts: sys => sys.logTimeoutQueueLength(),
             },
             {
                 caption: "non local edit in logic ts, and build logic",
@@ -49,7 +49,7 @@ describe("unittests:: tsc-watch:: projects with references: invoking when refere
                     const solutionBuilder = createSolutionBuilder(sys, ["logic"]);
                     solutionBuilder.build();
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "change in project reference config file builds correctly",
@@ -61,7 +61,7 @@ describe("unittests:: tsc-watch:: projects with references: invoking when refere
                     const solutionBuilder = createSolutionBuilder(sys, ["logic"]);
                     solutionBuilder.build();
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
         ],
         baselineDependencies: true
@@ -99,7 +99,7 @@ describe("unittests:: tsc-watch:: projects with references: invoking when refere
                     const solutionBuilder = createSolutionBuilder(sys, ["tsconfig.b.json"]);
                     solutionBuilder.build();
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "edit on config file",
@@ -110,42 +110,42 @@ describe("unittests:: tsc-watch:: projects with references: invoking when refere
                     });
                     changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "tsconfig.c.json"), { "@ref/*": ["./nrefs/*"] });
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert config file edit",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "tsconfig.c.json"), { "@ref/*": ["./refs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "edit in referenced config file",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "tsconfig.b.json"), { "@ref/*": ["./nrefs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert referenced config file edit",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "tsconfig.b.json"), { "@ref/*": ["./refs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "deleting referenced config file",
                 edit: sys => sys.deleteFile(getTsBuildProjectFilePath("transitiveReferences", "tsconfig.b.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert deleting referenced config file",
                 edit: sys => sys.ensureFileOrFolder(getTsBuildProjectFile("transitiveReferences", "tsconfig.b.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "deleting transitively referenced config file",
                 edit: sys => sys.deleteFile(getTsBuildProjectFilePath("transitiveReferences", "tsconfig.a.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert deleting transitively referenced config file",
                 edit: sys => sys.ensureFileOrFolder(getTsBuildProjectFile("transitiveReferences", "tsconfig.a.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
         ],
         baselineDependencies: true,
@@ -241,7 +241,7 @@ X;`,
                     const solutionBuilder = createSolutionBuilder(sys, ["b"]);
                     solutionBuilder.build();
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "edit on config file",
@@ -252,27 +252,27 @@ X;`,
                     });
                     changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "c/tsconfig.json"), { "@ref/*": ["../nrefs/*"] });
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert config file edit",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "c/tsconfig.json"), { "@ref/*": ["../refs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "edit in referenced config file",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "b/tsconfig.json"), { "@ref/*": ["../nrefs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert referenced config file edit",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "b/tsconfig.json"), { "@ref/*": ["../refs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "deleting referenced config file",
                 edit: sys => sys.deleteFile(getTsBuildProjectFilePath("transitiveReferences", "b/tsconfig.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert deleting referenced config file",
@@ -284,12 +284,12 @@ X;`,
                         references: [{ path: `../a` }]
                     })
                 ),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "deleting transitively referenced config file",
                 edit: sys => sys.deleteFile(getTsBuildProjectFilePath("transitiveReferences", "a/tsconfig.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert deleting transitively referenced config file",
@@ -300,7 +300,7 @@ X;`,
                         files: ["index.ts"]
                     }),
                 ),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
         ],
         baselineDependencies: true,
@@ -360,7 +360,7 @@ X;`,
                     const solutionBuilder = createSolutionBuilder(sys, ["b"]);
                     solutionBuilder.build();
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "edit on config file",
@@ -371,27 +371,27 @@ X;`,
                     });
                     changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "c/tsconfig.json"), { "@ref/*": ["../nrefs/*"] });
                 },
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert config file edit",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "c/tsconfig.json"), { "@ref/*": ["../refs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "edit in referenced config file",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "b/tsconfig.json"), { "@ref/*": ["../nrefs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert referenced config file edit",
                 edit: sys => changeCompilerOpitonsPaths(sys, getTsBuildProjectFilePath("transitiveReferences", "b/tsconfig.json"), { "@ref/*": ["../refs/*"] }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "deleting referenced config file",
                 edit: sys => sys.deleteFile(getTsBuildProjectFilePath("transitiveReferences", "b/tsconfig.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert deleting referenced config file",
@@ -402,12 +402,12 @@ X;`,
                         references: [{ path: `../a` }]
                     })
                 ),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "deleting transitively referenced config file",
                 edit: sys => sys.deleteFile(getTsBuildProjectFilePath("transitiveReferences", "a/tsconfig.json")),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
             {
                 caption: "Revert deleting transitively referenced config file",
@@ -415,7 +415,7 @@ X;`,
                     getTsBuildProjectFilePath("transitiveReferences", "a/tsconfig.json"),
                     JSON.stringify({ compilerOptions: { composite: true } }),
                 ),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2)
+                timeouts: sys => sys.runQueuedTimeoutCallbacks()
             },
         ],
         baselineDependencies: true,
@@ -446,7 +446,7 @@ X;`,
                     const solutionBuilder = createSolutionBuilder(sys, ["core"]);
                     solutionBuilder.build();
                 },
-                timeouts: sys => sys.runQueuedTimeoutCallbacks(0),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ],
         baselineDependencies: true
diff --git a/src/testRunner/unittests/tscWatch/resolutionCache.ts b/src/testRunner/unittests/tscWatch/resolutionCache.ts
index 0d50c03db8ce9..855a8c448505f 100644
--- a/src/testRunner/unittests/tscWatch/resolutionCache.ts
+++ b/src/testRunner/unittests/tscWatch/resolutionCache.ts
@@ -214,8 +214,8 @@ describe("unittests:: tsc-watch:: resolutionCache:: tsc-watch module resolution
                         sys.writeFile(imported.path, imported.content);
                     },
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1); // Scheduled invalidation of resolutions
-                        sys.checkTimeoutQueueLengthAndRun(1); // Actual update
+                        sys.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions
+                        sys.runQueuedTimeoutCallbacks(); // Actual update
                         assert.isTrue(fileExistsCalledForBar, "'fileExists' should be called.");
                     },
                 },
@@ -392,7 +392,7 @@ declare module "fs" {
                             path: `/user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts`,
                             content: JSON.stringify({ something: 10 })
                         }),
-                        timeouts: sys => sys.checkTimeoutQueueLength(0),
+                        timeouts: sys => sys.logTimeoutQueueLength(),
                     }
                 ]
             });
@@ -441,15 +441,15 @@ declare namespace myapp {
                     });
                 },
                 timeouts: sys => {
-                    sys.checkTimeoutQueueLengthAndRun(2); // Scheduled invalidation of resolutions, update that gets cancelled and rescheduled by actual invalidation of resolution
-                    sys.checkTimeoutQueueLengthAndRun(1); // Actual update
+                    sys.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions, update that gets cancelled and rescheduled by actual invalidation of resolution
+                    sys.runQueuedTimeoutCallbacks(); // Actual update
                 },
             },
             {
                 caption: "No change, just check program",
                 edit: ts.noop,
                 timeouts: (sys, [[oldProgram, oldBuilderProgram]], watchorSolution) => {
-                    sys.checkTimeoutQueueLength(0);
+                    sys.logTimeoutQueueLength();
                     const newProgram = (watchorSolution as ts.WatchOfConfigFile<ts.EmitAndSemanticDiagnosticsBuilderProgram>).getProgram();
                     assert.strictEqual(newProgram, oldBuilderProgram, "No change so builder program should be same");
                     assert.strictEqual(newProgram.getProgram(), oldProgram, "No change so program should be same");
diff --git a/src/testRunner/unittests/tscWatch/watchApi.ts b/src/testRunner/unittests/tscWatch/watchApi.ts
index 5e8c906ce2a5f..c657574f27983 100644
--- a/src/testRunner/unittests/tscWatch/watchApi.ts
+++ b/src/testRunner/unittests/tscWatch/watchApi.ts
@@ -6,7 +6,6 @@ import {
     createWatchedSystem,
     File,
     libFile,
-    TestServerHostTrackingWrittenFiles,
 } from "../virtualFileSystemWithWatch";
 import {
     applyEdit,
@@ -14,6 +13,7 @@ import {
     createWatchCompilerHostOfConfigFileForBaseline,
     createWatchCompilerHostOfFilesAndCompilerOptionsForBaseline,
     runWatchBaseline,
+    TscWatchSystem,
     watchBaseline,
 } from "./helpers";
 
@@ -200,7 +200,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when watchHost does not implement s
                 caption: "Write a file",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/bar.ts`, "const y =10;"),
                 timeouts: sys => {
-                    sys.checkTimeoutQueueLength(0);
+                    sys.logTimeoutQueueLength();
                     watch.getProgram();
                 }
             }],
@@ -245,7 +245,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when watchHost can add extraFileExt
             edits: [{
                 caption: "Write a file",
                 edit: sys => sys.writeFile(`/user/username/projects/myproject/other2.vue`, otherFile.content),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             }],
             watchOrSolution: watch
         });
@@ -277,7 +277,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when watchHost uses createSemanticD
     function createWatch<T extends ts.BuilderProgram>(
         baseline: string[],
         config: File,
-        sys: TestServerHostTrackingWrittenFiles,
+        sys: TscWatchSystem,
         createProgram: ts.CreateProgram<T>,
         optionsToExtend?: ts.CompilerOptions,
     ) {
@@ -319,9 +319,9 @@ describe("unittests:: tsc-watch:: watchAPI:: when watchHost uses createSemanticD
     function applyChangeForBuilderTest(
         baseline: string[],
         emitBaseline: string[],
-        sys: TestServerHostTrackingWrittenFiles,
-        emitSys: TestServerHostTrackingWrittenFiles,
-        change: (sys: TestServerHostTrackingWrittenFiles) => void,
+        sys: TscWatchSystem,
+        emitSys: TscWatchSystem,
+        change: (sys: TscWatchSystem) => void,
         caption: string
     ) {
         // Change file
@@ -333,8 +333,8 @@ describe("unittests:: tsc-watch:: watchAPI:: when watchHost uses createSemanticD
         baseline: string[],
         emitBaseline: string[],
         config: File,
-        sys: TestServerHostTrackingWrittenFiles,
-        emitSys: TestServerHostTrackingWrittenFiles,
+        sys: TscWatchSystem,
+        emitSys: TscWatchSystem,
         createProgram: ts.CreateProgram<T>,
         optionsToExtend?: ts.CompilerOptions) {
         createWatch(baseline, config, sys, createProgram, optionsToExtend);
@@ -569,17 +569,17 @@ describe("unittests:: tsc-watch:: watchAPI:: when getParsedCommandLine is implem
                         calledGetParsedCommandLine.clear();
                         sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.ts`, `class class3 {}`);
                     },
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "Add excluded file to project1",
                     edit: sys => sys.ensureFileOrFolder({ path: `/user/username/projects/myproject/projects/project1/temp/file.d.ts`, content: `declare class file {}` }),
-                    timeouts: sys => sys.checkTimeoutQueueLength(0),
+                    timeouts: sys => sys.logTimeoutQueueLength(),
                 },
                 {
                     caption: "Add output of class3",
                     edit: sys => sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.d.ts`, `declare class class3 {}`),
-                    timeouts: sys => sys.checkTimeoutQueueLength(0),
+                    timeouts: sys => sys.logTimeoutQueueLength(),
                 },
             ],
             watchOrSolution: watch
@@ -600,27 +600,27 @@ describe("unittests:: tsc-watch:: watchAPI:: when getParsedCommandLine is implem
                         calledGetParsedCommandLine.clear();
                         sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.ts`, `class class3 {}`);
                     },
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "Add class3 output to project1",
                     edit: sys => sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.d.ts`, `declare class class3 {}`),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "Add excluded file to project1",
                     edit: sys => sys.ensureFileOrFolder({ path: `/user/username/projects/myproject/projects/project1/temp/file.d.ts`, content: `declare class file {}` }),
-                    timeouts: sys => sys.checkTimeoutQueueLength(0),
+                    timeouts: sys => sys.logTimeoutQueueLength(),
                 },
                 {
                     caption: "Delete output of class3",
                     edit: sys => sys.deleteFile(`/user/username/projects/myproject/projects/project1/class3.d.ts`),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "Add output of class3",
                     edit: sys => sys.writeFile(`/user/username/projects/myproject/projects/project1/class3.d.ts`, `declare class class3 {}`),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
             ],
             watchOrSolution: watch
@@ -663,7 +663,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when builder emit occurs with emitO
                             sys.writeFile(`/user/username/projects/myproject/b.ts`, `export const y = 10;`);
                             callFullEmit = false;
                         },
-                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                        timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                     },
                     {
                         caption: "Emit with emitOnlyDts shouldnt emit anything",
@@ -672,7 +672,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when builder emit occurs with emitO
                             program.emit(/*targetSourceFile*/ undefined, /*writeFile*/ undefined, /*cancellationToken*/ undefined, /*emitOnlyDtsFiles*/ true);
                             baseline.cb(program);
                         },
-                        timeouts: sys => sys.checkTimeoutQueueLength(0),
+                        timeouts: sys => sys.logTimeoutQueueLength(),
                     },
                     {
                         caption: "Emit all files",
@@ -681,7 +681,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when builder emit occurs with emitO
                             program.emit();
                             baseline.cb(program);
                         },
-                        timeouts: sys => sys.checkTimeoutQueueLength(0),
+                        timeouts: sys => sys.logTimeoutQueueLength(),
                     },
                     {
                         caption: "Emit with emitOnlyDts shouldnt emit anything",
@@ -690,7 +690,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when builder emit occurs with emitO
                             program.emit(/*targetSourceFile*/ undefined, /*writeFile*/ undefined, /*cancellationToken*/ undefined, /*emitOnlyDtsFiles*/ true);
                             baseline.cb(program);
                         },
-                        timeouts: sys => sys.checkTimeoutQueueLength(0),
+                        timeouts: sys => sys.logTimeoutQueueLength(),
                     },
                     {
                         caption: "Emit full should not emit anything",
@@ -699,7 +699,7 @@ describe("unittests:: tsc-watch:: watchAPI:: when builder emit occurs with emitO
                             program.emit();
                             baseline.cb(program);
                         },
-                        timeouts: sys => sys.checkTimeoutQueueLength(0),
+                        timeouts: sys => sys.logTimeoutQueueLength(),
                     },
                 ],
                 watchOrSolution: watch
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index 17886d2f9da73..3d3506b248355 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -40,7 +40,7 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                     const mediumPollingIntervalThreshold = ts.unchangedPollThresholds[ts.PollingInterval.Medium];
                     for (let index = 0; index < mediumPollingIntervalThreshold; index++) {
                         // Transition libFile and file1 to low priority queue
-                        sys.checkTimeoutQueueLengthAndRun(1);
+                        sys.runQueuedTimeoutCallbacks();
                         assert.deepEqual(programs[0][0], initialProgram);
                     }
                     return;
@@ -51,14 +51,14 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                 // Make a change to file
                 edit: sys => sys.writeFile("/a/username/project/typescript.ts", "var zz30 = 100;"),
                 // During this timeout the file would be detected as unchanged
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Callbacks: medium priority + high priority queue and scheduled program update",
                 edit: ts.noop,
                 // Callbacks: medium priority + high priority queue and scheduled program update
                 // This should detect change in the file
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(3),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Polling queues polled and everything is in the high polling queue",
@@ -69,12 +69,12 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                     const newThreshold = ts.unchangedPollThresholds[ts.PollingInterval.Low] + mediumPollingIntervalThreshold;
                     for (let fileUnchangeDetected = 1; fileUnchangeDetected < newThreshold; fileUnchangeDetected++) {
                         // For high + Medium/low polling interval
-                        sys.checkTimeoutQueueLengthAndRun(2);
+                        sys.runQueuedTimeoutCallbacks();
                         assert.deepEqual(programs[0][0], initialProgram);
                     }
 
                     // Everything goes in high polling interval queue
-                    sys.checkTimeoutQueueLengthAndRun(1);
+                    sys.runQueuedTimeoutCallbacks();
                     return;
                 },
             }
@@ -105,7 +105,7 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                     // On each timeout file does not change
                     const initialProgram = programs[0][0];
                     for (let index = 0; index < 4; index++) {
-                        sys.checkTimeoutQueueLengthAndRun(1);
+                        sys.runQueuedTimeoutCallbacks();
                         assert.deepEqual(programs[0][0], initialProgram);
                     }
                 },
@@ -114,13 +114,13 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                 caption: "Make change to file but should detect as changed and schedule program update",
                 // Make a change to file
                 edit: sys => sys.writeFile(commonFile1.path, "var zz30 = 100;"),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Callbacks: queue and scheduled program update",
                 edit: ts.noop,
                 // Callbacks: scheduled program update and queue for the polling
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "The timeout is to check the status of all files",
@@ -128,7 +128,7 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                 timeouts: (sys, programs) => {
                     // On each timeout file does not change
                     const initialProgram = programs[0][0];
-                    sys.checkTimeoutQueueLengthAndRun(1);
+                    sys.runQueuedTimeoutCallbacks();
                     assert.deepEqual(programs[0][0], initialProgram);
                 },
             },
@@ -256,68 +256,55 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                     caption: "Directory watch updates because of file1.js creation",
                     edit: ts.noop,
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1); // To update directory callbacks for file1.js output
-                        sys.checkTimeoutQueueLength(0);
+                        sys.runQueuedTimeoutCallbacks(); // To update directory callbacks for file1.js output
                     },
                 },
                 {
                     caption: "Remove directory node_modules",
                     // Remove directory node_modules
                     edit: sys => sys.deleteFolder(`/user/username/projects/myproject/node_modules`, /*recursive*/ true),
-                    timeouts: sys => {
-                        sys.checkTimeoutQueueLength(3); // 1. Failed lookup invalidation 2. For updating program and 3. for updating child watches
-                        sys.runQueuedTimeoutCallbacks(sys.getNextTimeoutId() - 2); // Update program
-                    },
+                    // 1. Failed lookup invalidation 2. For updating program and 3. for updating child watches
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(sys.getNextTimeoutId() - 2), // Update program,
                 },
                 {
                     caption: "Pending directory watchers and program update",
                     edit: ts.noop,
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1); // To update directory watchers
-                        sys.checkTimeoutQueueLengthAndRun(2); // To Update program and failed lookup update
-                        sys.checkTimeoutQueueLengthAndRun(1); // Actual program update
-                        sys.checkTimeoutQueueLength(0);
+                        sys.runQueuedTimeoutCallbacks(); // To update directory watchers
+                        sys.runQueuedTimeoutCallbacks(); // To Update program and failed lookup update
+                        sys.runQueuedTimeoutCallbacks(); // Actual program update
                     },
                 },
                 {
                     caption: "Start npm install",
                     // npm install
                     edit: sys => sys.createDirectory(`/user/username/projects/myproject/node_modules`),
-                    timeouts: sys => sys.checkTimeoutQueueLength(1), // To update folder structure
+                    timeouts: sys => sys.logTimeoutQueueLength(), // To update folder structure
                 },
                 {
                     caption: "npm install folder creation of file2",
                     edit: sys => sys.createDirectory(`/user/username/projects/myproject/node_modules/file2`),
-                    timeouts: sys => sys.checkTimeoutQueueLength(1), // To update folder structure
+                    timeouts: sys => sys.logTimeoutQueueLength(), // To update folder structure
                 },
                 {
                     caption: "npm install index file in file2",
                     edit: sys => sys.writeFile(`/user/username/projects/myproject/node_modules/file2/index.d.ts`, `export const x = 10;`),
-                    timeouts: sys => sys.checkTimeoutQueueLength(1), // To update folder structure
+                    timeouts: sys => sys.logTimeoutQueueLength(), // To update folder structure
                 },
                 {
                     caption: "Updates the program",
                     edit: ts.noop,
-                    timeouts: sys => {
-                        sys.runQueuedTimeoutCallbacks();
-                        sys.checkTimeoutQueueLength(2); // To Update program and failed lookup update
-                    },
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(), // To Update program and failed lookup update
                 },
                 {
                     caption: "Invalidates module resolution cache",
                     edit: ts.noop,
-                    timeouts: sys => {
-                        sys.runQueuedTimeoutCallbacks();
-                        sys.checkTimeoutQueueLength(1); // To Update program
-                    },
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(), // To Update program
                 },
                 {
                     caption: "Pending updates",
                     edit: ts.noop,
-                    timeouts: sys => {
-                        sys.runQueuedTimeoutCallbacks();
-                        sys.checkTimeoutQueueLength(0);
-                    },
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
             ],
         });
@@ -347,17 +334,17 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                 {
                     caption: "Add new file, should schedule and run timeout to update directory watcher",
                     edit: sys => sys.writeFile(`/user/username/projects/myproject/src/file3.ts`, `export const y = 10;`),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Update the child watch
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Update the child watch
                 },
                 {
                     caption: "Actual program update to include new file",
                     edit: ts.noop,
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2), // Scheduling failed lookup update and program update
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Scheduling failed lookup update and program update
                 },
                 {
                     caption: "After program emit with new file, should schedule and run timeout to update directory watcher",
                     edit: ts.noop,
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1), // Update the child watch
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(), // Update the child watch
                 },
                 noopChange,
             ],
@@ -388,19 +375,16 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                 {
                     caption: "rename the file",
                     edit: sys => sys.renameFile(`/user/username/projects/myproject/src/file2.ts`, `/user/username/projects/myproject/src/renamed.ts`),
-                    timeouts: sys => {
-                        sys.checkTimeoutQueueLength(2); // 1. For updating program and 2. for updating child watches
-                        sys.runQueuedTimeoutCallbacks(1); // Update program
-                    },
+                    // 1. For updating program and 2. for updating child watches
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(1), // Update program
                 },
                 {
                     caption: "Pending directory watchers and program update",
                     edit: ts.noop,
                     timeouts: sys => {
-                        sys.checkTimeoutQueueLengthAndRun(1); // To update directory watchers
-                        sys.checkTimeoutQueueLengthAndRun(2); // To Update program and failed lookup update
-                        sys.checkTimeoutQueueLengthAndRun(1); // Actual program update
-                        sys.checkTimeoutQueueLength(0);
+                        sys.runQueuedTimeoutCallbacks(); // To update directory watchers
+                        sys.runQueuedTimeoutCallbacks(); // To Update program and failed lookup update
+                        sys.runQueuedTimeoutCallbacks(); // Actual program update
                     },
                 },
             ],
@@ -516,7 +500,7 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                         {
                             caption: "Change foo",
                             edit: sys => sys.replaceFileText(`/user/username/projects/myproject/node_modules/bar/foo.d.ts`, "foo", "fooBar"),
-                            timeouts: sys => sys.checkTimeoutQueueLength(0),
+                            timeouts: sys => sys.logTimeoutQueueLength(),
                         }
                     ]
                 });
@@ -530,7 +514,7 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                         {
                             caption: "delete fooBar",
                             edit: sys => sys.deleteFile(`/user/username/projects/myproject/node_modules/bar/fooBar.d.ts`),
-                            timeouts: sys => sys.checkTimeoutQueueLength(0),                            }
+                            timeouts: sys => sys.logTimeoutQueueLength(),                            }
                     ]
                 });
 
@@ -543,15 +527,12 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                         {
                             caption: "Directory watch updates because of main.js creation",
                             edit: ts.noop,
-                            timeouts: sys => {
-                                sys.checkTimeoutQueueLengthAndRun(1); // To update directory callbacks for main.js output
-                                sys.checkTimeoutQueueLength(0);
-                            },
+                            timeouts: sys => sys.runQueuedTimeoutCallbacks(), // To update directory callbacks for main.js output
                         },
                         {
                             caption: "add new folder to temp",
                             edit: sys => sys.ensureFileOrFolder({ path: `/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts`, content: "export function temp(): string;" }),
-                            timeouts: sys => sys.checkTimeoutQueueLength(0),
+                            timeouts: sys => sys.logTimeoutQueueLength(),
                         }
                     ]
                 });
@@ -587,12 +568,12 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                     invokeFileDeleteCreateAsPartInsteadOfChange: true,
                     ignoreDelete: true,
                 }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
             {
                 caption: "Replace file with rename event that fixes error",
                 edit: sys => sys.modifyFile(`/user/username/projects/myproject/foo.ts`, `export declare function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, }),
-                timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                timeouts: sys => sys.runQueuedTimeoutCallbacks(),
             },
         ]
     });
@@ -618,12 +599,12 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                 {
                     caption: "Replace file with rename event that introduces error",
                     edit: sys => sys.modifyFile(`/user/username/projects/myproject/foo.d.ts`, `export function foo2(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true }),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "Replace file with rename event that fixes error",
                     edit: sys => sys.modifyFile(`/user/username/projects/myproject/foo.d.ts`, `export function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true }),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
             ]
         });
@@ -648,12 +629,12 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                 {
                     caption: "Replace file with rename event that introduces error",
                     edit: sys => sys.modifyFile(`/user/username/projects/myproject/foo.d.ts`, `export function foo2(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, useTildeAsSuffixInRenameEventFileName: true }),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "Replace file with rename event that fixes error",
                     edit: sys => sys.modifyFile(`/user/username/projects/myproject/foo.d.ts`, `export function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, useTildeAsSuffixInRenameEventFileName: true }),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
             ]
         });
@@ -687,12 +668,12 @@ describe("unittests:: tsc-watch:: watchEnvironment:: tsc-watch with different po
                         ignoreDelete: true,
                         skipInodeCheckOnCreate: true
                     }),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
                 {
                     caption: "Replace file with rename event that fixes error",
                     edit: sys => sys.modifyFile(`/user/username/projects/myproject/foo.ts`, `export declare function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, }),
-                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    timeouts: sys => sys.runQueuedTimeoutCallbacks(),
                 },
             ]
         });
diff --git a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
index cede3edf97d44..b1c030c980495 100644
--- a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
+++ b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
@@ -430,7 +430,7 @@ describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectS
                 { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib" },
                 { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js", content: "'use strict';\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _ponyfill = require('./ponyfill');\n\nvar _ponyfill2 = _interopRequireDefault(_ponyfill);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }\n\nvar root; /* global window */\n\n\nif (typeof self !== 'undefined') {\n  root = self;\n} else if (typeof window !== 'undefined') {\n  root = window;\n} else if (typeof global !== 'undefined') {\n  root = global;\n} else if (typeof module !== 'undefined') {\n  root = module;\n} else {\n  root = Function('return this')();\n}\n\nvar result = (0, _ponyfill2['default'])(root);\nexports['default'] = result;" },
             ].map(getRootedFileOrFolder);
-            verifyAfterPartialOrCompleteNpmInstall(2);
+            verifyAfterPartialOrCompleteNpmInstall();
 
             filesAndFoldersToAdd.push(...[
                 { path: "/a/b/node_modules/.staging/typescript-8493ea5d/lib" },
@@ -440,12 +440,12 @@ describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectS
                 { path: "/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594", content: "" }
             ].map(getRootedFileOrFolder));
             // Since we added/removed in .staging no timeout
-            verifyAfterPartialOrCompleteNpmInstall(0);
+            verifyAfterPartialOrCompleteNpmInstall();
 
             // Remove file "/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594"
             host.deleteFile(ts.last(filesAndFoldersToAdd).path);
             filesAndFoldersToAdd.length--;
-            verifyAfterPartialOrCompleteNpmInstall(0);
+            verifyAfterPartialOrCompleteNpmInstall();
 
             filesAndFoldersToAdd.push(...[
                 { path: "/a/b/node_modules/.staging/rxjs-22375c61/bundles" },
@@ -453,7 +453,7 @@ describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectS
                 { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom" },
                 { path: "/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts", content: "\n// Stub for lodash\nexport = _;\nexport as namespace _;\ndeclare var _: _.LoDashStatic;\ndeclare namespace _ {\n    interface LoDashStatic {\n        someProp: string;\n    }\n    class SomeClass {\n        someMethod(): void;\n    }\n}" }
             ].map(getRootedFileOrFolder));
-            verifyAfterPartialOrCompleteNpmInstall(0);
+            verifyAfterPartialOrCompleteNpmInstall();
 
             filesAndFoldersToAdd.push(...[
                 { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler" },
@@ -462,7 +462,7 @@ describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectS
                 { path: "/a/b/node_modules/.staging/rxjs-22375c61/testing" },
                 { path: "/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041", content: "{\n  \"_args\": [\n    [\n      {\n        \"raw\": \"rxjs@^5.4.2\",\n        \"scope\": null,\n        \"escapedName\": \"rxjs\",\n        \"name\": \"rxjs\",\n        \"rawSpec\": \"^5.4.2\",\n        \"spec\": \">=5.4.2 <6.0.0\",\n        \"type\": \"range\"\n      },\n      \"C:\\\\Users\\\\shkamat\\\\Desktop\\\\app\"\n    ]\n  ],\n  \"_from\": \"rxjs@>=5.4.2 <6.0.0\",\n  \"_id\": \"rxjs@5.4.3\",\n  \"_inCache\": true,\n  \"_location\": \"/rxjs\",\n  \"_nodeVersion\": \"7.7.2\",\n  \"_npmOperationalInternal\": {\n    \"host\": \"s3://npm-registry-packages\",\n    \"tmp\": \"tmp/rxjs-5.4.3.tgz_1502407898166_0.6800217325799167\"\n  },\n  \"_npmUser\": {\n    \"name\": \"blesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"_npmVersion\": \"5.3.0\",\n  \"_phantomChildren\": {},\n  \"_requested\": {\n    \"raw\": \"rxjs@^5.4.2\",\n    \"scope\": null,\n    \"escapedName\": \"rxjs\",\n    \"name\": \"rxjs\",\n    \"rawSpec\": \"^5.4.2\",\n    \"spec\": \">=5.4.2 <6.0.0\",\n    \"type\": \"range\"\n  },\n  \"_requiredBy\": [\n    \"/\"\n  ],\n  \"_resolved\": \"https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz\",\n  \"_shasum\": \"0758cddee6033d68e0fd53676f0f3596ce3d483f\",\n  \"_shrinkwrap\": null,\n  \"_spec\": \"rxjs@^5.4.2\",\n  \"_where\": \"C:\\\\Users\\\\shkamat\\\\Desktop\\\\app\",\n  \"author\": {\n    \"name\": \"Ben Lesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"bugs\": {\n    \"url\": \"https://github.com/ReactiveX/RxJS/issues\"\n  },\n  \"config\": {\n    \"commitizen\": {\n      \"path\": \"cz-conventional-changelog\"\n    }\n  },\n  \"contributors\": [\n    {\n      \"name\": \"Ben Lesh\",\n      \"email\": \"ben@benlesh.com\"\n    },\n    {\n      \"name\": \"Paul Taylor\",\n      \"email\": \"paul.e.taylor@me.com\"\n    },\n    {\n      \"name\": \"Jeff Cross\",\n      \"email\": \"crossj@google.com\"\n    },\n    {\n      \"name\": \"Matthew Podwysocki\",\n      \"email\": \"matthewp@microsoft.com\"\n    },\n    {\n      \"name\": \"OJ Kwon\",\n      \"email\": \"kwon.ohjoong@gmail.com\"\n    },\n    {\n      \"name\": \"Andre Staltz\",\n      \"email\": \"andre@staltz.com\"\n    }\n  ],\n  \"dependencies\": {\n    \"symbol-observable\": \"^1.0.1\"\n  },\n  \"description\": \"Reactive Extensions for modern JavaScript\",\n  \"devDependencies\": {\n    \"babel-polyfill\": \"^6.23.0\",\n    \"benchmark\": \"^2.1.0\",\n    \"benchpress\": \"2.0.0-beta.1\",\n    \"chai\": \"^3.5.0\",\n    \"color\": \"^0.11.1\",\n    \"colors\": \"1.1.2\",\n    \"commitizen\": \"^2.8.6\",\n    \"coveralls\": \"^2.11.13\",\n    \"cz-conventional-changelog\": \"^1.2.0\",\n    \"danger\": \"^1.1.0\",\n    \"doctoc\": \"^1.0.0\",\n    \"escape-string-regexp\": \"^1.0.5 \",\n    \"esdoc\": \"^0.4.7\",\n    \"eslint\": \"^3.8.0\",\n    \"fs-extra\": \"^2.1.2\",\n    \"get-folder-size\": \"^1.0.0\",\n    \"glob\": \"^7.0.3\",\n    \"gm\": \"^1.22.0\",\n    \"google-closure-compiler-js\": \"^20170218.0.0\",\n    \"gzip-size\": \"^3.0.0\",\n    \"http-server\": \"^0.9.0\",\n    \"husky\": \"^0.13.3\",\n    \"lint-staged\": \"3.2.5\",\n    \"lodash\": \"^4.15.0\",\n    \"madge\": \"^1.4.3\",\n    \"markdown-doctest\": \"^0.9.1\",\n    \"minimist\": \"^1.2.0\",\n    \"mkdirp\": \"^0.5.1\",\n    \"mocha\": \"^3.0.2\",\n    \"mocha-in-sauce\": \"0.0.1\",\n    \"npm-run-all\": \"^4.0.2\",\n    \"npm-scripts-info\": \"^0.3.4\",\n    \"nyc\": \"^10.2.0\",\n    \"opn-cli\": \"^3.1.0\",\n    \"platform\": \"^1.3.1\",\n    \"promise\": \"^7.1.1\",\n    \"protractor\": \"^3.1.1\",\n    \"rollup\": \"0.36.3\",\n    \"rollup-plugin-inject\": \"^2.0.0\",\n    \"rollup-plugin-node-resolve\": \"^2.0.0\",\n    \"rx\": \"latest\",\n    \"rxjs\": \"latest\",\n    \"shx\": \"^0.2.2\",\n    \"sinon\": \"^2.1.0\",\n    \"sinon-chai\": \"^2.9.0\",\n    \"source-map-support\": \"^0.4.0\",\n    \"tslib\": \"^1.5.0\",\n    \"eslint\": \"^5.16.0\",\n    \"typescript\": \"~2.0.6\",\n    \"typings\": \"^2.0.0\",\n    \"validate-commit-msg\": \"^2.14.0\",\n    \"watch\": \"^1.0.1\",\n    \"webpack\": \"^1.13.1\",\n    \"xmlhttprequest\": \"1.8.0\"\n  },\n  \"directories\": {},\n  \"dist\": {\n    \"integrity\": \"sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==\",\n    \"shasum\": \"0758cddee6033d68e0fd53676f0f3596ce3d483f\",\n    \"tarball\": \"https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz\"\n  },\n  \"engines\": {\n    \"npm\": \">=2.0.0\"\n  },\n  \"homepage\": \"https://github.com/ReactiveX/RxJS\",\n  \"keywords\": [\n    \"Rx\",\n    \"RxJS\",\n    \"ReactiveX\",\n    \"ReactiveExtensions\",\n    \"Streams\",\n    \"Observables\",\n    \"Observable\",\n    \"Stream\",\n    \"ES6\",\n    \"ES2015\"\n  ],\n  \"license\": \"Apache-2.0\",\n  \"lint-staged\": {\n    \"*.@(js)\": [\n      \"eslint --fix\",\n      \"git add\"\n    ],\n    \"*.@(ts)\": [\n      \"eslint -c .eslintrc --ext .ts . --fix\",\n      \"git add\"\n    ]\n  },\n  \"main\": \"Rx.js\",\n  \"maintainers\": [\n    {\n      \"name\": \"blesh\",\n      \"email\": \"ben@benlesh.com\"\n    }\n  ],\n  \"name\": \"rxjs\",\n  \"optionalDependencies\": {},\n  \"readme\": \"ERROR: No README data found!\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git+ssh://git@github.com/ReactiveX/RxJS.git\"\n  },\n  \"scripts-info\": {\n    \"info\": \"List available script\",\n    \"build_all\": \"Build all packages (ES6, CJS, UMD) and generate packages\",\n    \"build_cjs\": \"Build CJS package with clean up existing build, copy source into dist\",\n    \"build_es6\": \"Build ES6 package with clean up existing build, copy source into dist\",\n    \"build_closure_core\": \"Minify Global core build using closure compiler\",\n    \"build_global\": \"Build Global package, then minify build\",\n    \"build_perf\": \"Build CJS & Global build, run macro performance test\",\n    \"build_test\": \"Build CJS package & test spec, execute mocha test runner\",\n    \"build_cover\": \"Run lint to current code, build CJS & test spec, execute test coverage\",\n    \"build_docs\": \"Build ES6 & global package, create documentation using it\",\n    \"build_spec\": \"Build test specs\",\n    \"check_circular_dependencies\": \"Check codebase has circular dependencies\",\n    \"clean_spec\": \"Clean up existing test spec build output\",\n    \"clean_dist_cjs\": \"Clean up existing CJS package output\",\n    \"clean_dist_es6\": \"Clean up existing ES6 package output\",\n    \"clean_dist_global\": \"Clean up existing Global package output\",\n    \"commit\": \"Run git commit wizard\",\n    \"compile_dist_cjs\": \"Compile codebase into CJS module\",\n    \"compile_module_es6\": \"Compile codebase into ES6\",\n    \"cover\": \"Execute test coverage\",\n    \"lint_perf\": \"Run lint against performance test suite\",\n    \"lint_spec\": \"Run lint against test spec\",\n    \"lint_src\": \"Run lint against source\",\n    \"lint\": \"Run lint against everything\",\n    \"perf\": \"Run macro performance benchmark\",\n    \"perf_micro\": \"Run micro performance benchmark\",\n    \"test_mocha\": \"Execute mocha test runner against existing test spec build\",\n    \"test_browser\": \"Execute mocha test runner on browser against existing test spec build\",\n    \"test\": \"Clean up existing test spec build, build test spec and execute mocha test runner\",\n    \"tests2png\": \"Generate marble diagram image from test spec\",\n    \"watch\": \"Watch codebase, trigger compile when source code changes\"\n  },\n  \"typings\": \"Rx.d.ts\",\n  \"version\": \"5.4.3\"\n}\n" }
             ].map(getRootedFileOrFolder));
-            verifyAfterPartialOrCompleteNpmInstall(0);
+            verifyAfterPartialOrCompleteNpmInstall();
 
             // remove /a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
             host.deleteFile(ts.last(filesAndFoldersToAdd).path);
@@ -478,7 +478,7 @@ describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectS
                 { path: "/a/b/node_modules/.bin" }
             ].map(getRootedFileOrFolder));
             // From the type root update
-            verifyAfterPartialOrCompleteNpmInstall(2);
+            verifyAfterPartialOrCompleteNpmInstall();
 
             ts.forEach(filesAndFoldersToAdd, f => {
                 f.path = f.path
@@ -489,7 +489,7 @@ describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectS
             host.deleteFolder(root + "/a/b/node_modules/.staging", /*recursive*/ true);
             // npm installation complete, timeout after reload fs
             npmInstallComplete = true;
-            verifyAfterPartialOrCompleteNpmInstall(2);
+            verifyAfterPartialOrCompleteNpmInstall();
 
             baselineTsserverLogs(
                 "cachingFileSystemInformation",
@@ -497,20 +497,14 @@ describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectS
                 projectService
             );
 
-            function verifyAfterPartialOrCompleteNpmInstall(timeoutQueueLengthWhenRunningTimeouts: number) {
+            function verifyAfterPartialOrCompleteNpmInstall() {
                 filesAndFoldersToAdd.forEach(f => host.ensureFileOrFolder(f));
                 if (npmInstallComplete || timeoutDuringPartialInstallation) {
-                    if (timeoutQueueLengthWhenRunningTimeouts) {
-                        // Expected project update
-                        host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts + 1); // Scheduled invalidation of resolutions
-                        host.runQueuedTimeoutCallbacks(); // Actual update
-                    }
-                    else {
-                        host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts);
-                    }
+                    host.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions
+                    host.runQueuedTimeoutCallbacks(); // Actual update
                 }
                 else {
-                    host.checkTimeoutQueueLength(3);
+                    projectService.testhost.logTimeoutQueueLength();
                 }
             }
         }
diff --git a/src/testRunner/unittests/tsserver/cancellationToken.ts b/src/testRunner/unittests/tsserver/cancellationToken.ts
index 53b85a9c1e276..0c0cccc0e14dd 100644
--- a/src/testRunner/unittests/tsserver/cancellationToken.ts
+++ b/src/testRunner/unittests/tsserver/cancellationToken.ts
@@ -87,7 +87,7 @@ describe("unittests:: tsserver:: cancellationToken", () => {
                 arguments: { files: ["/a/missing"], delay: 0 }
             });
             // Queued files
-            host.checkTimeoutQueueLengthAndRun(1);
+            host.runQueuedTimeoutCallbacks();
             // Completed event since file is missing
         }
         {
@@ -133,7 +133,7 @@ describe("unittests:: tsserver:: cancellationToken", () => {
             host.runQueuedTimeoutCallbacks();
             // the semanticDiag message
             host.runQueuedImmediateCallbacks();
-            host.runQueuedImmediateCallbacks(1);
+            host.runQueuedImmediateCallbacks();
             cancellationToken.resetToken();
         }
         {
diff --git a/src/testRunner/unittests/tsserver/configuredProjects.ts b/src/testRunner/unittests/tsserver/configuredProjects.ts
index 898e8187be83d..e569aa2f7583b 100644
--- a/src/testRunner/unittests/tsserver/configuredProjects.ts
+++ b/src/testRunner/unittests/tsserver/configuredProjects.ts
@@ -112,11 +112,11 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
 
         // Add a tsconfig file
         host.writeFile(configFile.path, configFile.content);
-        host.checkTimeoutQueueLengthAndRun(2); // load configured project from disk + ensureProjectsForOpenFiles
+        host.runQueuedTimeoutCallbacks(); // load configured project from disk + ensureProjectsForOpenFiles
 
         // remove the tsconfig file
         host.deleteFile(configFile.path);
-        host.checkTimeoutQueueLengthAndRun(1); // Refresh inferred projects
+        host.runQueuedTimeoutCallbacks(); // Refresh inferred projects
 
         baselineTsserverLogs("configuredProjects", "add and then remove a config file in a folder with loose files", projectService);
     });
@@ -132,7 +132,7 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
 
         // add a new ts file
         host.writeFile(commonFile2.path, commonFile2.content);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("configuredProjects", "add new files to a configured project without file list", projectService);
     });
 
@@ -165,11 +165,11 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
 
         // delete commonFile2
         host.deleteFile(commonFile2.path);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         // re-add commonFile2
         host.writeFile(commonFile2.path, commonFile2.content);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("configuredProjects", "handle recreated files correctly", projectService);
     });
 
@@ -234,7 +234,7 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
                 },
                 "files": ["${file1.path}"]
             }`);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         // will not remove project 1
         logInferredProjectsOrphanStatus(projectService);
@@ -371,7 +371,7 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
         projectService.openClientFile(file3.path);
 
         host.writeFile(configFile.path, configFile.content);
-        host.checkTimeoutQueueLengthAndRun(2); // load configured project from disk + ensureProjectsForOpenFiles
+        host.runQueuedTimeoutCallbacks(); // load configured project from disk + ensureProjectsForOpenFiles
         logInferredProjectsOrphanStatus(projectService);
         baselineTsserverLogs("configuredProjects", "open file become a part of configured project if it is referenced from root file", projectService);
     });
@@ -397,7 +397,7 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
 
         host.writeFile(file2.path, file2.content);
 
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         baselineTsserverLogs("configuredProjects", "can correctly update configured project when set of root files has changed (new file on disk)", projectService);
     });
@@ -423,7 +423,7 @@ describe("unittests:: tsserver:: ConfiguredProjects", () => {
 
         host.writeFile(configFile.path, JSON.stringify({ compilerOptions: {}, files: ["f1.ts", "f2.ts"] }));
 
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("configuredProjects", "can correctly update configured project when set of root files has changed (new file in list of files)", projectService);
     });
 
@@ -697,7 +697,7 @@ declare var console: {
         const host = createServerHost([barConfig, barIndex, fooConfig, fooIndex, barSymLink, lib2017, libDom]);
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([fooIndex, barIndex], session);
-        verifyGetErrRequest({ session, host, files: [barIndex, fooIndex] });
+        verifyGetErrRequest({ session, files: [barIndex, fooIndex] });
         baselineTsserverLogs("configuredProjects", "when multiple projects are open detects correct default project", session);
     });
 
@@ -780,11 +780,10 @@ declare var console: {
             }
             verifyGetErrRequest({
                 session,
-                host,
                 files: errorOnNewFileBeforeOldFile ?
                     [fooBar, foo] :
                     [foo, fooBar],
-                existingTimeouts: withExclude ? 0 : 2
+                existingTimeouts: !withExclude
             });
             baselineTsserverLogs("configuredProjects", `creating new file and then open it ${openFileBeforeCreating ? "before" : "after"} watcher is invoked, ask errors on it ${errorOnNewFileBeforeOldFile ? "before" : "after"} old one${withExclude ? " without file being in config" : ""}`, session);
         }
@@ -929,7 +928,7 @@ foo();`
                     strict: true
                 }
             }));
-            host.checkTimeoutQueueLengthAndRun(3);
+            host.runQueuedTimeoutCallbacks();
 
             host.writeFile(bravoExtendedConfig.path, JSON.stringify({
                 extends: "./alpha.tsconfig.json",
@@ -937,15 +936,15 @@ foo();`
                     strict: false
                 }
             }));
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
 
             host.writeFile(bConfig.path, JSON.stringify({
                 extends: "../extended/alpha.tsconfig.json",
             }));
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
 
             host.writeFile(alphaExtendedConfig.path, "{}");
-            host.checkTimeoutQueueLengthAndRun(3);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("configuredProjects", "should watch the extended configs of multiple projects", projectService);
         });
 
diff --git a/src/testRunner/unittests/tsserver/dynamicFiles.ts b/src/testRunner/unittests/tsserver/dynamicFiles.ts
index db8bd6158d0e6..69ab05ba990f3 100644
--- a/src/testRunner/unittests/tsserver/dynamicFiles.ts
+++ b/src/testRunner/unittests/tsserver/dynamicFiles.ts
@@ -81,7 +81,7 @@ describe("unittests:: tsserver:: dynamicFiles:: Untitled files", () => {
             content: "const x = 10;"
         };
         host.writeFile(untitled.path, untitled.content);
-        host.checkTimeoutQueueLength(0);
+        service.testhost.logTimeoutQueueLength();
         service.openClientFile(untitled.path, untitled.content, /*scriptKind*/ undefined, "/user/username/projects/myproject");
 
         service.closeClientFile(untitledFile);
diff --git a/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts b/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts
index b79f13927b270..eb6f106d6f57d 100644
--- a/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts
+++ b/src/testRunner/unittests/tsserver/events/projectLanguageServiceState.ts
@@ -40,7 +40,7 @@ describe("unittests:: tsserver:: events:: ProjectLanguageServiceStateEvent", ()
         session.logger.log(`Language service enabled: ${session.getProjectService().configuredProjects.get(config.path)!.languageServiceEnabled}`);
 
         host.writeFile(configWithExclude.path, configWithExclude.content);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         session.logger.log(`Language service enabled: ${session.getProjectService().configuredProjects.get(config.path)!.languageServiceEnabled}`);
         baselineTsserverLogs("events/projectLanguageServiceState", "language service disabled events are triggered", session);
     });
diff --git a/src/testRunner/unittests/tsserver/events/projectLoading.ts b/src/testRunner/unittests/tsserver/events/projectLoading.ts
index 3cb8574a87ffc..75adbb0507cb0 100644
--- a/src/testRunner/unittests/tsserver/events/projectLoading.ts
+++ b/src/testRunner/unittests/tsserver/events/projectLoading.ts
@@ -54,7 +54,7 @@ describe("unittests:: tsserver:: events:: ProjectLoadingStart and ProjectLoading
                 openFilesForSession([aTs], session);
 
                 host.writeFile(configA.path, configA.content);
-                host.checkTimeoutQueueLengthAndRun(2);
+                host.runQueuedTimeoutCallbacks();
                 baselineTsserverLogs("events/projectLoading", `change is detected in the config file ${sessionType}`, session);
             });
 
@@ -74,7 +74,7 @@ describe("unittests:: tsserver:: events:: ProjectLoadingStart and ProjectLoading
                 openFilesForSession([bTs], session);
 
                 host.writeFile(configA.path, configA.content);
-                host.checkTimeoutQueueLengthAndRun(2);
+                host.runQueuedTimeoutCallbacks();
                 baselineTsserverLogs("events/projectLoading", `change is detected in an extended config file ${sessionType}`, session);
             });
 
diff --git a/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts b/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts
index 581b0b577b3d6..da4e8649bdebd 100644
--- a/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts
+++ b/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts
@@ -379,7 +379,7 @@ describe("unittests:: tsserver:: events:: ProjectsUpdatedInBackground", () => {
 
                     file3.content += "export class d {}";
                     host.writeFile(file3.path, file3.content);
-                    host.checkTimeoutQueueLengthAndRun(2);
+                    host.runQueuedTimeoutCallbacks();
 
                     host.writeFile(file2.path, file2.content);
                     host.runQueuedTimeoutCallbacks(); // For invalidation
diff --git a/src/testRunner/unittests/tsserver/externalProjects.ts b/src/testRunner/unittests/tsserver/externalProjects.ts
index 2402ca8c11a68..edca714e0775b 100644
--- a/src/testRunner/unittests/tsserver/externalProjects.ts
+++ b/src/testRunner/unittests/tsserver/externalProjects.ts
@@ -634,7 +634,7 @@ describe("unittests:: tsserver:: externalProjects", () => {
         projectService.openClientFile(app.path);
 
         host.writeFile(config2.path, config2.content);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         baselineTsserverLogs("externalProjects", "correctly handles changes in lib section of config file", projectService);
     });
diff --git a/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts b/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts
index 165a010853870..680ea481b15c6 100644
--- a/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts
+++ b/src/testRunner/unittests/tsserver/forceConsistentCasingInFileNames.ts
@@ -77,7 +77,7 @@ describe("unittests:: tsserver:: forceConsistentCasingInFileNames", () => {
         const host = createServerHost([loggerFile, anotherFile, tsconfig, libFile, tsconfig]);
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([{ file: loggerFile, projectRootPath: "/user/username/projects/myproject" }], session);
-        verifyGetErrRequest({ session, host, files: [loggerFile] });
+        verifyGetErrRequest({ session, files: [loggerFile] });
 
         const newLoggerPath = loggerFile.path.toLowerCase();
         host.renameFile(loggerFile.path, newLoggerPath);
@@ -103,7 +103,7 @@ describe("unittests:: tsserver:: forceConsistentCasingInFileNames", () => {
         });
 
         // Check errors in both files
-        verifyGetErrRequest({ session, host, files: [newLoggerPath, anotherFile] });
+        verifyGetErrRequest({ session, files: [newLoggerPath, anotherFile] });
         baselineTsserverLogs("forceConsistentCasingInFileNames", "works when renaming file with different casing", session);
     });
 
@@ -126,7 +126,7 @@ describe("unittests:: tsserver:: forceConsistentCasingInFileNames", () => {
         const host = createServerHost([loggerFile, anotherFile, tsconfig, libFile, tsconfig]);
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([{ file: anotherFile, projectRootPath: "/user/username/projects/myproject" }], session);
-        verifyGetErrRequest({ session, host, files: [anotherFile] });
+        verifyGetErrRequest({ session, files: [anotherFile] });
 
         session.executeCommandSeq<ts.server.protocol.UpdateOpenRequest>({
             command: ts.server.protocol.CommandTypes.UpdateOpen,
@@ -145,7 +145,7 @@ describe("unittests:: tsserver:: forceConsistentCasingInFileNames", () => {
         });
 
         // Check errors in both files
-        verifyGetErrRequest({ host, session, files: [anotherFile] });
+        verifyGetErrRequest({ session, files: [anotherFile] });
         baselineTsserverLogs("forceConsistentCasingInFileNames", "when changing module name with different casing", session);
     });
 });
diff --git a/src/testRunner/unittests/tsserver/helpers.ts b/src/testRunner/unittests/tsserver/helpers.ts
index a520bc202efbe..989ef7bc9d86b 100644
--- a/src/testRunner/unittests/tsserver/helpers.ts
+++ b/src/testRunner/unittests/tsserver/helpers.ts
@@ -384,6 +384,7 @@ export function toExternalFiles(fileNames: string[]) {
 export type TestSessionAndServiceHost = TestServerHostTrackingWrittenFiles & {
     patched: boolean;
     baselineHost(title: string): void;
+    logTimeoutQueueLength(): void;
 };
 function patchHostTimeouts(
     inputHost: TestServerHostTrackingWrittenFiles,
@@ -391,50 +392,47 @@ function patchHostTimeouts(
 ) {
     const host = inputHost as TestSessionAndServiceHost;
     if (host.patched) return host;
-    const originalCheckTimeoutQueueLength = host.checkTimeoutQueueLength;
+    host.patched = true;
+    if (!logger.hasLevel(ts.server.LogLevel.verbose)) {
+        host.logTimeoutQueueLength = ts.notImplemented;
+        host.baselineHost = ts.notImplemented;
+        return host;
+    }
+
     const originalRunQueuedTimeoutCallbacks = host.runQueuedTimeoutCallbacks;
     const originalRunQueuedImmediateCallbacks = host.runQueuedImmediateCallbacks;
     let hostDiff: ReturnType<TestServerHost["snap"]> | undefined;
 
-    host.checkTimeoutQueueLengthAndRun = checkTimeoutQueueLengthAndRun;
-    host.checkTimeoutQueueLength = checkTimeoutQueueLength;
     host.runQueuedTimeoutCallbacks = runQueuedTimeoutCallbacks;
     host.runQueuedImmediateCallbacks = runQueuedImmediateCallbacks;
+    host.logTimeoutQueueLength = logTimeoutQueueLength;
     host.baselineHost = baselineHost;
     host.patched = true;
     return host;
 
-    function checkTimeoutQueueLengthAndRun(expected: number) {
-        host.baselineHost(`Before checking timeout queue length (${expected}) and running`);
-        originalCheckTimeoutQueueLength.call(host, expected);
-        originalRunQueuedTimeoutCallbacks.call(host);
-        host.baselineHost(`After checking timeout queue length (${expected}) and running`);
-    }
-
-    function checkTimeoutQueueLength(expected: number) {
-        host.baselineHost(`Checking timeout queue length: ${expected}`);
-        originalCheckTimeoutQueueLength.call(host, expected);
+    function logTimeoutQueueLength() {
+        logger.log(host.timeoutCallbacks.log());
+        host.baselineHost(host.immediateCallbacks.log());
     }
 
     function runQueuedTimeoutCallbacks(timeoutId?: number) {
-        host.baselineHost(`Before running timeout callback${timeoutId === undefined ? "s" : timeoutId}`);
+        host.baselineHost(`Before running ${host.timeoutCallbacks.log()}`);
+        if (timeoutId !== undefined) logger.log(`Invoking ${host.timeoutCallbacks.callbackType} callback:: timeoutId:: ${timeoutId}:: ${host.timeoutCallbacks.map[timeoutId].args[0]}`);
         originalRunQueuedTimeoutCallbacks.call(host, timeoutId);
-        host.baselineHost(`After running timeout callback${timeoutId === undefined ? "s" : timeoutId}`);
+        host.baselineHost(`After running ${host.timeoutCallbacks.log()}`);
     }
 
-    function runQueuedImmediateCallbacks(checkCount?: number) {
-        host.baselineHost(`Before running immediate callbacks${checkCount === undefined ? "" : ` and checking length (${checkCount})`}`);
-        originalRunQueuedImmediateCallbacks.call(host, checkCount);
-        host.baselineHost(`After running immediate callbacks${checkCount === undefined ? "" : ` and checking length (${checkCount})`}`);
+    function runQueuedImmediateCallbacks() {
+        host.baselineHost(`Before running ${host.immediateCallbacks.log()}`);
+        originalRunQueuedImmediateCallbacks.call(host);
+        host.baselineHost(`After running ${host.immediateCallbacks.log()}`);
     }
 
     function baselineHost(title: string) {
-        if (!logger.hasLevel(ts.server.LogLevel.verbose)) return;
         logger.log(title);
-        const logs = logger.logs || [];
-        host.diff(logs, hostDiff);
-        host.serializeWatches(logs);
-        if (!logger.logs) logs.forEach(log => logger.log(log));
+        ts.Debug.assertIsDefined(logger.logs);
+        host.diff(logger.logs, hostDiff);
+        host.serializeWatches(logger.logs);
         hostDiff = host.snap();
         host.writtenFiles.clear();
     }
@@ -574,7 +572,7 @@ export class TestProjectService extends ts.server.ProjectService {
             changeToHostTrackingWrittenFiles(this.host as TestServerHost),
             this.logger
         );
-        this.testhost.baselineHost("Creating project service");
+        if (logger.hasLevel(ts.server.LogLevel.verbose)) this.testhost.baselineHost("Creating project service");
     }
 }
 
@@ -739,8 +737,7 @@ export function logDiagnostics(sessionOrService: TestSession | TestProjectServic
 }
 export interface VerifyGetErrRequestBase {
     session: TestSession;
-    host: TestServerHost;
-    existingTimeouts?: number;
+    existingTimeouts?: boolean;
 }
 export interface VerifyGetErrRequest extends VerifyGetErrRequestBase {
     files: readonly (string | File)[];
@@ -760,18 +757,12 @@ export interface CheckAllErrors extends VerifyGetErrRequestBase {
     files: readonly any[];
     skip?: readonly (SkipErrors | undefined)[];
 }
-function checkAllErrors({ session, host, existingTimeouts, files, skip }: CheckAllErrors) {
+function checkAllErrors({ session, existingTimeouts, files, skip }: CheckAllErrors) {
     ts.Debug.assert(session.logger.logs?.length);
     for (let i = 0; i < files.length; i++) {
-        if (existingTimeouts !== undefined) {
-            host.checkTimeoutQueueLength(existingTimeouts + 1);
-            host.runQueuedTimeoutCallbacks(host.getNextTimeoutId() - 1);
-        }
-        else {
-            host.checkTimeoutQueueLengthAndRun(1);
-        }
-        if (!skip?.[i]?.semantic) host.runQueuedImmediateCallbacks(1);
-        if (!skip?.[i]?.suggestion) host.runQueuedImmediateCallbacks(1);
+        session.testhost.runQueuedTimeoutCallbacks(existingTimeouts ? session.testhost.getNextTimeoutId() - 1 : undefined);
+        if (!skip?.[i]?.semantic) session.testhost.runQueuedImmediateCallbacks();
+        if (!skip?.[i]?.suggestion) session.testhost.runQueuedImmediateCallbacks();
     }
 }
 
@@ -785,7 +776,7 @@ function verifyErrorsUsingGeterr({scenario, subScenario, allFiles, openFiles, ge
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession(openFiles(), session);
 
-        verifyGetErrRequest({ session, host, files: getErrRequest() });
+        verifyGetErrRequest({ session, files: getErrRequest() });
         baselineTsserverLogs(scenario, `${subScenario} getErr`, session);
     });
 }
@@ -801,7 +792,7 @@ function verifyErrorsUsingGeterrForProject({ scenario, subScenario, allFiles, op
                 command: ts.server.protocol.CommandTypes.GeterrForProject,
                 arguments: { delay: 0, file: filePath(expected.project) }
             });
-            checkAllErrors({ session, host, files: expected.files });
+            checkAllErrors({ session, files: expected.files });
         }
         baselineTsserverLogs(scenario, `${subScenario} geterrForProject`, session);
     });
diff --git a/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts b/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts
index d741cc022ff68..3901de75ab78b 100644
--- a/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts
+++ b/src/testRunner/unittests/tsserver/inconsistentErrorInEditor.ts
@@ -35,7 +35,7 @@ describe("unittests:: tsserver:: inconsistentErrorInEditor", () => {
                 format: "2020"
             }
         });
-        verifyGetErrRequest({ session, host, files: ["^/untitled/ts-nul-authority/Untitled-1"] });
+        verifyGetErrRequest({ session, files: ["^/untitled/ts-nul-authority/Untitled-1"] });
         baselineTsserverLogs("inconsistentErrorInEditor", "should not error", session);
     });
 });
@@ -67,7 +67,7 @@ describe("unittests:: tsserver:: inconsistentErrorInEditor2", () => {
                 format: "2020"
             }
         });
-        verifyGetErrRequest({ session, host, files: ["^/untitled/ts-nul-authority/Untitled-1"] });
+        verifyGetErrRequest({ session, files: ["^/untitled/ts-nul-authority/Untitled-1"] });
         baselineTsserverLogs("inconsistentErrorInEditor2", "should not error", session);
     });
 });
diff --git a/src/testRunner/unittests/tsserver/inferredProjects.ts b/src/testRunner/unittests/tsserver/inferredProjects.ts
index dbe00bd659310..7b41d3b9d8b80 100644
--- a/src/testRunner/unittests/tsserver/inferredProjects.ts
+++ b/src/testRunner/unittests/tsserver/inferredProjects.ts
@@ -67,7 +67,7 @@ describe("unittests:: tsserver:: inferredProjects", () => {
         projectService.openClientFile(file3.path);
 
         host.writeFile(configFile.path, configFile.content);
-        host.checkTimeoutQueueLengthAndRun(2); // load configured project from disk + ensureProjectsForOpenFiles
+        host.runQueuedTimeoutCallbacks(); // load configured project from disk + ensureProjectsForOpenFiles
         baselineTsserverLogs("inferredProjects", "should use only one inferred project if useOneInferredProject is set", projectService);
     });
 
@@ -101,7 +101,7 @@ describe("unittests:: tsserver:: inferredProjects", () => {
         projectService.openClientFile(file1.path);
         projectService.openClientFile(modFile.path);
         projectService.setCompilerOptionsForInferredProjects({ moduleResolution: ts.ModuleResolutionKind.Classic });
-        host.checkTimeoutQueueLengthAndRun(3);
+        host.runQueuedTimeoutCallbacks();
         logInferredProjectsOrphanStatus(projectService);
         baselineTsserverLogs("inferredProjects", "project settings for inferred projects", projectService);
     });
@@ -286,7 +286,7 @@ describe("unittests:: tsserver:: inferredProjects", () => {
             allowJs: true,
             target: ts.ScriptTarget.ES2015
         }, session);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
         baselineTsserverLogs("inferredProjects", "Setting compiler options for inferred projects when there are no open files should not schedule any refresh", session);
     });
 });
diff --git a/src/testRunner/unittests/tsserver/moduleResolution.ts b/src/testRunner/unittests/tsserver/moduleResolution.ts
index c83d202d46910..d03488e35e4a4 100644
--- a/src/testRunner/unittests/tsserver/moduleResolution.ts
+++ b/src/testRunner/unittests/tsserver/moduleResolution.ts
@@ -49,7 +49,7 @@ describe("unittests:: tsserver:: moduleResolution", () => {
             openFilesForSession([fileA], session);
             return {
                 host, session, packageFile,
-                verifyErr: () => verifyGetErrRequest({ files: [fileA], session, host }),
+                verifyErr: () => verifyGetErrRequest({ files: [fileA], session }),
             };
         }
         it("package json file is edited", () => {
diff --git a/src/testRunner/unittests/tsserver/openFile.ts b/src/testRunner/unittests/tsserver/openFile.ts
index b6515dcf6a886..59b036e6c9969 100644
--- a/src/testRunner/unittests/tsserver/openFile.ts
+++ b/src/testRunner/unittests/tsserver/openFile.ts
@@ -153,7 +153,7 @@ bar();`
         const host = createServerHost([file, libFile]);
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([file], session);
-        verifyGetErrRequest({ session, host, files: [file] });
+        verifyGetErrRequest({ session, files: [file] });
 
         // Remove first ts-ignore and check only first error is reported
         const tsIgnoreComment = `// @ts-ignore`;
@@ -170,7 +170,7 @@ bar();`
                 }]
             }
         });
-        verifyGetErrRequest({ session, host, files: [file] });
+        verifyGetErrRequest({ session, files: [file] });
         // Revert the change and no errors should be reported
         session.executeCommandSeq<ts.server.protocol.UpdateOpenRequest>({
             command: ts.server.protocol.CommandTypes.UpdateOpen,
@@ -184,7 +184,7 @@ bar();`
                 }]
             }
         });
-        verifyGetErrRequest({ session, host, files: [file] });
+        verifyGetErrRequest({ session, files: [file] });
         baselineTsserverLogs("openfile", "when file makes edits to add/remove comment directives, they are handled correcrly", session);
     });
 
diff --git a/src/testRunner/unittests/tsserver/partialSemanticServer.ts b/src/testRunner/unittests/tsserver/partialSemanticServer.ts
index 7663e0efa0393..ef1a7c2ad752c 100644
--- a/src/testRunner/unittests/tsserver/partialSemanticServer.ts
+++ b/src/testRunner/unittests/tsserver/partialSemanticServer.ts
@@ -127,7 +127,7 @@ import { something } from "something";
         assert.isTrue(diagnostics.length === 1);
         assert.equal(diagnostics[0].messageText, expectedErrorMessage);
 
-        verifyGetErrRequest({ session, host, files: [file1], skip: [{ semantic: true, suggestion: true }] });
+        verifyGetErrRequest({ session, files: [file1], skip: [{ semantic: true, suggestion: true }] });
         baselineTsserverLogs("partialSemanticServer", "syntactic diagnostics are returned with no error", session);
     });
 
diff --git a/src/testRunner/unittests/tsserver/projectErrors.ts b/src/testRunner/unittests/tsserver/projectErrors.ts
index 73dfa31f2bbdf..e844c34343e0a 100644
--- a/src/testRunner/unittests/tsserver/projectErrors.ts
+++ b/src/testRunner/unittests/tsserver/projectErrors.ts
@@ -243,8 +243,7 @@ describe("unittests:: tsserver:: projectErrors:: are reported as appropriate", (
             appendAllScriptInfos(session);
 
             // Since this is not js project so no typings are queued
-            host.checkTimeoutQueueLength(0);
-            verifyGetErrRequest({ session, host, files: [untitledFile] });
+            verifyGetErrRequest({ session, files: [untitledFile] });
             baselineTsserverLogs("projectErrors", `when opening new file that doesnt exist on disk yet ${useProjectRoot ? "with projectRoot" : "without projectRoot"}`, session);
         }
 
@@ -278,12 +277,12 @@ describe("unittests:: tsserver:: projectErrors:: are reported as appropriate", (
             command: ts.server.protocol.CommandTypes.Open,
             arguments: { file: app.path, }
         });
-        verifyGetErrRequest({ session, host, files: [app] });
+        verifyGetErrRequest({ session, files: [app] });
 
         host.renameFolder(`${projectDir}/foo`, `${projectDir}/foo2`);
         host.runQueuedTimeoutCallbacks();
         host.runQueuedTimeoutCallbacks();
-        verifyGetErrRequest({ session, host, files: [app] });
+        verifyGetErrRequest({ session, files: [app] });
         baselineTsserverLogs("projectErrors", `folder rename updates project structure and reports no errors`, session);
     });
 
@@ -302,7 +301,7 @@ describe("unittests:: tsserver:: projectErrors:: are reported as appropriate", (
             }
         });
 
-        host.checkTimeoutQueueLengthAndRun(1);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("projectErrors", "getting errors before opening file", session);
     });
 
@@ -324,10 +323,10 @@ describe("unittests:: tsserver:: projectErrors:: are reported as appropriate", (
         const session = createSession(host, { useInferredProjectPerProjectRoot: true, canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([{ file: app, projectRootPath: "/user/username/projects/myproject" }], session);
         openFilesForSession([{ file: backendTest, projectRootPath: "/user/username/projects/myproject" }], session);
-        verifyGetErrRequest({ session, host, files: [backendTest.path, app.path] });
+        verifyGetErrRequest({ session, files: [backendTest.path, app.path] });
         closeFilesForSession([backendTest], session);
         openFilesForSession([{ file: serverUtilities.path, projectRootPath: "/user/username/projects/myproject" }], session);
-        verifyGetErrRequest({ session, host, files: [serverUtilities.path, app.path] });
+        verifyGetErrRequest({ session, files: [serverUtilities.path, app.path] });
         baselineTsserverLogs("projectErrors", `reports errors correctly when file referenced by inferred project root, is opened right after closing the root file`, session);
     });
 
@@ -362,7 +361,7 @@ declare module '@custom/plugin' {
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([aFile], session);
 
-        checkErrors();
+        verifyGetErrRequest({ session, files: [aFile] });
 
         session.executeCommandSeq<ts.server.protocol.ChangeRequest>({
             command: ts.server.protocol.CommandTypes.Change,
@@ -375,13 +374,8 @@ declare module '@custom/plugin' {
                 insertString: "o"
             }
         });
-        checkErrors();
+        verifyGetErrRequest({ session, files: [aFile] });
         baselineTsserverLogs("projectErrors", `correct errors when resolution resolves to file that has same ambient module and is also module`, session);
-
-        function checkErrors() {
-            host.checkTimeoutQueueLength(0);
-            verifyGetErrRequest({ session, host, files: [aFile] });
-        }
     });
 
     describe("when semantic error returns includes global error", () => {
@@ -728,18 +722,18 @@ console.log(blabla);`
     }
 
     it("should not report incorrect error when json is root file found by tsconfig", () => {
-        const { host, session, test } = createSessionForTest({
+        const { session, test } = createSessionForTest({
             include: ["./src/*.ts", "./src/*.json"]
         });
-        verifyGetErrRequest({ session, host, files: [test] });
+        verifyGetErrRequest({ session, files: [test] });
         baselineTsserverLogs("projectErrors", `should not report incorrect error when json is root file found by tsconfig`, session);
     });
 
     it("should report error when json is not root file found by tsconfig", () => {
-        const { host, session, test } = createSessionForTest({
+        const { session, test } = createSessionForTest({
             include: ["./src/*.ts"]
         });
-        verifyGetErrRequest({ session, host, files: [test] });
+        verifyGetErrRequest({ session, files: [test] });
         baselineTsserverLogs("projectErrors", `should report error when json is not root file found by tsconfig`, session);
     });
 });
@@ -763,7 +757,7 @@ describe("unittests:: tsserver:: projectErrors:: with npm install when", () => {
         const host = createServerHost(projectFiles);
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([{ file: main, projectRootPath: "/user/username/projects/myproject" }], session);
-        verifyGetErrRequest({ session, host, files: [main] });
+        verifyGetErrRequest({ session, files: [main] });
 
         let npmInstallComplete = false;
 
@@ -775,7 +769,7 @@ describe("unittests:: tsserver:: projectErrors:: with npm install when", () => {
             { path: `/user/username/projects/myproject/node_modules/.staging/@babel/helper-plugin-utils-a06c629f` },
             { path: `/user/username/projects/myproject/node_modules/.staging/core-js-db53158d` },
         ];
-        verifyWhileNpmInstall(3);
+        verifyWhileNpmInstall();
 
         filesAndFoldersToAdd = [
             { path: `/user/username/projects/myproject/node_modules/.staging/@angular/platform-browser-dynamic-5efaaa1a` },
@@ -783,34 +777,32 @@ describe("unittests:: tsserver:: projectErrors:: with npm install when", () => {
             { path: `/user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts`, content: `export const y = 10;` },
         ];
         // Since we added/removed in .staging no timeout
-        verifyWhileNpmInstall(0);
+        verifyWhileNpmInstall();
 
         filesAndFoldersToAdd = [];
         host.ensureFileOrFolder(moduleFile, /*ignoreWatchInvokedWithTriggerAsFileCreate*/ true, /*ignoreParentWatch*/ true);
         // Since we added/removed in .staging no timeout
-        verifyWhileNpmInstall(0);
+        verifyWhileNpmInstall();
 
         // Remove staging folder to remove errors
         host.deleteFolder(`/user/username/projects/myproject/node_modules/.staging`, /*recursive*/ true);
         npmInstallComplete = true;
         projectFiles.push(moduleFile);
         // Additional watch for watching script infos from node_modules
-        verifyWhileNpmInstall(3);
+        verifyWhileNpmInstall();
 
         baselineTsserverLogs("projectErrors", `npm install when timeout occurs ${timeoutDuringPartialInstallation ? "inbetween" : "after"} installation`, session);
 
-        function verifyWhileNpmInstall(timeouts: number) {
+        function verifyWhileNpmInstall() {
             filesAndFoldersToAdd.forEach(f => host.ensureFileOrFolder(f));
             if (npmInstallComplete || timeoutDuringPartialInstallation) {
-                host.checkTimeoutQueueLengthAndRun(timeouts); // Invalidation of failed lookups
-                if (timeouts) {
-                    host.checkTimeoutQueueLengthAndRun(timeouts - 1); // Actual update
-                }
+                host.runQueuedTimeoutCallbacks(); // Invalidation of failed lookups
+                host.runQueuedTimeoutCallbacks(); // Actual update
             }
             else {
-                host.checkTimeoutQueueLength(timeouts ? 3 : 2);
+                session.testhost.logTimeoutQueueLength();
             }
-            verifyGetErrRequest({ session, host, files: [main], existingTimeouts: !npmInstallComplete && !timeoutDuringPartialInstallation ? timeouts ? 3 : 2 : undefined });
+            verifyGetErrRequest({ session, files: [main], existingTimeouts: !npmInstallComplete && !timeoutDuringPartialInstallation });
         }
     }
 
diff --git a/src/testRunner/unittests/tsserver/projectReferences.ts b/src/testRunner/unittests/tsserver/projectReferences.ts
index 83a164ddb1b52..0c4761de5d90b 100644
--- a/src/testRunner/unittests/tsserver/projectReferences.ts
+++ b/src/testRunner/unittests/tsserver/projectReferences.ts
@@ -309,7 +309,7 @@ function foo() {
             // Create symlink in node module
             const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
             openFilesForSession([aTest], session);
-            verifyGetErrRequest({ session, host, files: [aTest] });
+            verifyGetErrRequest({ session, files: [aTest] });
             session.executeCommandSeq<ts.server.protocol.UpdateOpenRequest>({
                 command: ts.server.protocol.CommandTypes.UpdateOpen,
                 arguments: {
@@ -323,7 +323,7 @@ function foo() {
                     }]
                 }
             });
-            verifyGetErrRequest({ session, host, files: [aTest] });
+            verifyGetErrRequest({ session, files: [aTest] });
             baselineTsserverLogs("projectReferences", `monorepo like with symlinks ${scenario} and solution is ${alreadyBuilt ? "built" : "not built"}${extraOptions.preserveSymlinks ? " with preserveSymlinks" : ""}`, session);
         }
 
@@ -460,7 +460,7 @@ testCompositeFunction('why hello there', 42);`
         const host = createServerHost([libFile, compositeConfig, compositePackageJson, compositeIndex, compositeTestModule, consumerConfig, consumerIndex, symlink], { useCaseSensitiveFileNames: true });
         const session = createSession(host, { canUseEvents: true, logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([consumerIndex], session);
-        verifyGetErrRequest({ host, session, files: [consumerIndex] });
+        verifyGetErrRequest({ session, files: [consumerIndex] });
         baselineTsserverLogs("projectReferences", `when the referenced projects have allowJs and emitDeclarationOnly`, session);
     });
 
@@ -942,7 +942,7 @@ export function bar() {}`
         }
 
         function verifySolutionScenario(input: Setup) {
-            const { session, service, host } = setup(input);
+            const { session, service } = setup(input);
 
             const info = service.getScriptInfoForPath(main.path as ts.Path)!;
             session.logger.startGroup();
@@ -951,7 +951,7 @@ export function bar() {}`
             session.logger.endGroup();
 
             // Verify errors
-            verifyGetErrRequest({ session, host, files: [main] });
+            verifyGetErrRequest({ session, files: [main] });
 
             // Verify collection of script infos
             service.openClientFile(dummyFilePath);
@@ -1223,16 +1223,16 @@ bar;`
             // Add new class to referenced project
             const class3 = `/user/username/projects/myproject/projects/project1/class3.ts`;
             host.writeFile(class3, `class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
 
             // Add excluded file to referenced project
             host.ensureFileOrFolder({ path: `/user/username/projects/myproject/projects/project1/temp/file.d.ts`, content: `declare class file {}` });
-            host.checkTimeoutQueueLengthAndRun(0);
+            host.runQueuedTimeoutCallbacks();
 
             // Add output from new class to referenced project
             const class3Dts = `/user/username/projects/myproject/projects/project1/class3.d.ts`;
             host.writeFile(class3Dts, `declare class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(0);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectReferences", `new file is added to the referenced project when referenced project is not open`, session);
         });
 
@@ -1243,14 +1243,14 @@ bar;`
             // Add new class to referenced project
             const class3 = `/user/username/projects/myproject/projects/project1/class3.ts`;
             host.writeFile(class3, `class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(3);
+            host.runQueuedTimeoutCallbacks();
             // Add excluded file to referenced project
             host.ensureFileOrFolder({ path: `/user/username/projects/myproject/projects/project1/temp/file.d.ts`, content: `declare class file {}` });
-            host.checkTimeoutQueueLengthAndRun(0);
+            host.runQueuedTimeoutCallbacks();
             // Add output from new class to referenced project
             const class3Dts = `/user/username/projects/myproject/projects/project1/class3.d.ts`;
             host.writeFile(class3Dts, `declare class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(0);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectReferences", `new file is added to the referenced project when referenced project is open`, session);
         });
 
@@ -1260,20 +1260,20 @@ bar;`
             // Add new class to referenced project
             const class3 = `/user/username/projects/myproject/projects/project1/class3.ts`;
             host.writeFile(class3, `class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             // Add output of new class to referenced project
             const class3Dts = `/user/username/projects/myproject/projects/project1/class3.d.ts`;
             host.writeFile(class3Dts, `declare class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             // Add excluded file to referenced project
             host.ensureFileOrFolder({ path: `/user/username/projects/myproject/projects/project1/temp/file.d.ts`, content: `declare class file {}` });
-            host.checkTimeoutQueueLengthAndRun(0);
+            host.runQueuedTimeoutCallbacks();
             // Delete output from new class to referenced project
             host.deleteFile(class3Dts);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             // Write back output of new class to referenced project
             host.writeFile(class3Dts, `declare class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectReferences", `new file is added to the referenced project when referenced project is not open with disableSourceOfProjectReferenceRedirect`, session);
         });
 
@@ -1284,20 +1284,20 @@ bar;`
             // Add new class to referenced project
             const class3 = `/user/username/projects/myproject/projects/project1/class3.ts`;
             host.writeFile(class3, `class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(3);
+            host.runQueuedTimeoutCallbacks();
             // Add output of new class to referenced project
             const class3Dts = `/user/username/projects/myproject/projects/project1/class3.d.ts`;
             host.writeFile(class3Dts, `declare class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             // Add excluded file to referenced project
             host.ensureFileOrFolder({ path: `/user/username/projects/myproject/projects/project1/temp/file.d.ts`, content: `declare class file {}` });
-            host.checkTimeoutQueueLengthAndRun(0);
+            host.runQueuedTimeoutCallbacks();
             // Delete output from new class to referenced project
             host.deleteFile(class3Dts);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             // Write back output of new class to referenced project
             host.writeFile(class3Dts, `declare class class3 {}`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectReferences", `new file is added to the referenced project when referenced project is open with disableSourceOfProjectReferenceRedirect`, session);
         });
     });
diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts
index 8a8197d755612..e4f076b6d95f4 100644
--- a/src/testRunner/unittests/tsserver/projects.ts
+++ b/src/testRunner/unittests/tsserver/projects.ts
@@ -72,7 +72,7 @@ describe("unittests:: tsserver:: projects::", () => {
             }`;
         host.writeFile(configFile.path, configFile.content);
 
-        host.checkTimeoutQueueLengthAndRun(2); // Update the configured project + refresh inferred projects
+        host.runQueuedTimeoutCallbacks(); // Update the configured project + refresh inferred projects
 
         openFilesForSession([commonFile2], session);
         baselineTsserverLogs("projects", "should create new inferred projects for files excluded from a configured project", session);
@@ -282,7 +282,7 @@ describe("unittests:: tsserver:: projects::", () => {
         projectService.openClientFile(file3.path);
 
         host.writeFile(file2.path, `export * from "../c/f3"`); // now inferred project should inclule file3
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         logInferredProjectsOrphanStatus(projectService);
         baselineTsserverLogs("projects", "changes in closed files are reflected in project structure", projectService);
     });
@@ -307,7 +307,7 @@ describe("unittests:: tsserver:: projects::", () => {
         projectService.openClientFile(file3.path);
 
         host.deleteFile(file2.path);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("projects", "deleted files affect project structure", projectService);
     });
 
@@ -384,7 +384,7 @@ describe("unittests:: tsserver:: projects::", () => {
             unresolvedImports: response.unresolvedImports,
         });
 
-        host.checkTimeoutQueueLength(0);
+        projectService.testhost.logTimeoutQueueLength();
         assert.isUndefined(request);
         baselineTsserverLogs("projects", "file with name constructor.js doesnt cause issue with typeAcquisition when safe type list", projectService);
     });
@@ -553,7 +553,7 @@ describe("unittests:: tsserver:: projects::", () => {
         projectService.openClientFile(file2.path);
 
         host.deleteFile(config.path);
-        host.checkTimeoutQueueLengthAndRun(1);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("projects", "config file is deleted", projectService);
     });
 
@@ -1155,7 +1155,7 @@ describe("unittests:: tsserver:: projects::", () => {
         service.openClientFile(file1.path);
 
         host.modifyFile(file1.path, file1.content, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
-        host.checkTimeoutQueueLength(0);
+        service.testhost.logTimeoutQueueLength();
         baselineTsserverLogs("projects", "no project structure update on directory watch invoke on open file save", service);
     });
 
@@ -1326,43 +1326,43 @@ describe("unittests:: tsserver:: projects::", () => {
         openFile(fileB);
         openFile(fileSubA);
 
-        host.checkTimeoutQueueLengthAndRun(0);
+        host.runQueuedTimeoutCallbacks();
 
         // This should schedule 2 timeouts for ensuring project structure and ensuring projects for open file
         host.deleteFile(fileSubA.path);
         host.deleteFolder(ts.getDirectoryPath(fileSubA.path));
         host.writeFile(fileA.path, fileA.content);
-        host.checkTimeoutQueueLength(2);
+        session.testhost.logTimeoutQueueLength();
 
         closeFilesForSession([fileSubA], session);
         // This should cancel existing updates and schedule new ones
-        host.checkTimeoutQueueLength(2);
+        session.testhost.logTimeoutQueueLength();
 
         // Open the fileA (as if rename)
         // config project is updated to check if fileA is present in it
         openFile(fileA);
 
         // Run the timeout for updating configured project and ensuring projects for open file
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         // file is deleted but watches are not yet invoked
         const originalFileExists = host.fileExists;
         host.fileExists = s => s === fileA.path ? false : originalFileExists.call(host, s);
         closeFilesForSession([fileA], session);
-        host.checkTimeoutQueueLength(2); // Update configured project and projects for open file
+        session.testhost.logTimeoutQueueLength(); // Update configured project and projects for open file
 
         // This should create inferred project since fileSubA not on the disk
         openFile(fileSubA);
 
-        host.checkTimeoutQueueLengthAndRun(2); // Update configured project and projects for open file
+        host.runQueuedTimeoutCallbacks(); // Update configured project and projects for open file
         host.fileExists = originalFileExists;
 
         // Actually trigger the file move
         host.deleteFile(fileA.path);
         host.ensureFileOrFolder(fileSubA);
-        host.checkTimeoutQueueLength(2);
+        session.testhost.logTimeoutQueueLength();
 
-        verifyGetErrRequest({ session, host, files: [fileB, fileSubA], existingTimeouts: 2 });
+        verifyGetErrRequest({ session, files: [fileB, fileSubA], existingTimeouts: true });
         baselineTsserverLogs("projects", "handles delayed directory watch invoke on file creation", session);
 
         function openFile(file: File) {
diff --git a/src/testRunner/unittests/tsserver/projectsWithReferences.ts b/src/testRunner/unittests/tsserver/projectsWithReferences.ts
index ac4104794d7ea..a4fc9218a3cb5 100644
--- a/src/testRunner/unittests/tsserver/projectsWithReferences.ts
+++ b/src/testRunner/unittests/tsserver/projectsWithReferences.ts
@@ -27,18 +27,18 @@ describe("unittests:: tsserver:: projects with references: invoking when referen
 
         // local edit in ts file
         host.appendFile(logicIndex.path, `function foo() {}`);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         // non local edit in ts file
         host.appendFile(logicIndex.path, `export function gfoo() {}`);
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         // change in project reference config file
         host.writeFile(logicConfig.path, JSON.stringify({
             compilerOptions: { composite: true, declaration: true, declarationDir: "decls" },
             references: [{ path: "../core" }]
         }));
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("projectsWithReferences", "sample project", service);
     });
 
@@ -99,7 +99,7 @@ export class A {}`
 
             // non local edit
             host.appendFile(bTs.path, `export function gFoo() { }`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectsWithReferences", "transitive references with non local edit", service);
         });
 
@@ -113,11 +113,11 @@ export class A {}`
             host.ensureFileOrFolder(nRefsTs);
             cTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
             host.writeFile(cConfig.path, JSON.stringify(cTsConfigJson));
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
 
             // revert the edit on config file
             host.writeFile(cConfig.path, cConfig.content);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectsWithReferences", "transitive references with edit on config file", service);
         });
 
@@ -131,33 +131,33 @@ export class A {}`
             host.ensureFileOrFolder(nRefsTs);
             bTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
             host.writeFile(bConfig.path, JSON.stringify(bTsConfigJson));
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
 
             // revert the edit on config file
             host.writeFile(bConfig.path, bConfig.content);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectsWithReferences", "transitive references with edit in referenced config file", service);
         });
 
         it("deleting referenced config file", () => {
             const { host, service, bConfig } = createService();
             host.deleteFile(bConfig.path);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
 
             // revert
             host.writeFile(bConfig.path, bConfig.content);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
             baselineTsserverLogs("projectsWithReferences", "transitive references with deleting referenced config file", service);
         });
 
         it("deleting transitively referenced config file", () => {
             const { host, service, aConfig } = createService();
             host.deleteFile(aConfig.path);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
 
             // revert
             host.writeFile(aConfig.path, aConfig.content);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
             baselineTsserverLogs("projectsWithReferences", "transitive references with deleting transitively referenced config file", service);
         });
     });
@@ -214,7 +214,7 @@ export class A {}`
 
             // non local edit
             host.appendFile(bTs.path, `export function gFoo() { }`);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectsWithReferences", "trasitive references without files with non local edit", service);
         });
 
@@ -228,11 +228,11 @@ export class A {}`
             host.ensureFileOrFolder(nRefsTs);
             cTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
             host.writeFile(cConfig.path, JSON.stringify(cTsConfigJson));
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
 
             // revert the edit on config file
             host.writeFile(cConfig.path, cConfig.content);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectsWithReferences", "trasitive references without files with edit on config file", service);
         });
 
@@ -246,33 +246,33 @@ export class A {}`
             host.ensureFileOrFolder(nRefsTs);
             bTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
             host.writeFile(bConfig.path, JSON.stringify(bTsConfigJson));
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
 
             // revert the edit on config file
             host.writeFile(bConfig.path, bConfig.content);
-            host.checkTimeoutQueueLengthAndRun(2);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("projectsWithReferences", "trasitive references without files with edit in referenced config file", service);
         });
 
         it("deleting referenced config file", () => {
             const { host, service, bConfig } = createService();
             host.deleteFile(bConfig.path);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
 
             // revert
             host.writeFile(bConfig.path, bConfig.content);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
             baselineTsserverLogs("projectsWithReferences", "trasitive references without files with deleting referenced config file", service);
         });
 
         it("deleting transitively referenced config file", () => {
             const { host, service, aConfig } = createService();
             host.deleteFile(aConfig.path);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
 
             // revert
             host.writeFile(aConfig.path, aConfig.content);
-            host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
+            host.runQueuedTimeoutCallbacks(); // Schedules failed lookup invalidation
             baselineTsserverLogs("projectsWithReferences", "trasitive references without files with deleting transitively referenced config file", service);
         });
     });
diff --git a/src/testRunner/unittests/tsserver/reloadProjects.ts b/src/testRunner/unittests/tsserver/reloadProjects.ts
index 78244c633e80b..92d915db65e8c 100644
--- a/src/testRunner/unittests/tsserver/reloadProjects.ts
+++ b/src/testRunner/unittests/tsserver/reloadProjects.ts
@@ -43,14 +43,14 @@ describe("unittests:: tsserver:: reloadProjects", () => {
         const updatedText = `${file2.content}
             bar();`;
         host.writeFile(file2.path, updatedText);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
         session.executeCommandSeq({
             command: ts.server.protocol.CommandTypes.ReloadProjects
         });
 
         // delete file
         host.deleteFile(file2.path);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
         session.executeCommandSeq({
             command: ts.server.protocol.CommandTypes.ReloadProjects
         });
@@ -67,7 +67,7 @@ describe("unittests:: tsserver:: reloadProjects", () => {
 
         // Install module1
         host.ensureFileOrFolder(moduleFile);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
 
         session.executeCommandSeq({
             command: ts.server.protocol.CommandTypes.ReloadProjects
@@ -94,7 +94,7 @@ describe("unittests:: tsserver:: reloadProjects", () => {
 
         // Install module1
         host.ensureFileOrFolder(moduleFile);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
 
         session.executeCommandSeq({
             command: ts.server.protocol.CommandTypes.ReloadProjects
@@ -120,7 +120,7 @@ describe("unittests:: tsserver:: reloadProjects", () => {
 
         // Install module1
         host.ensureFileOrFolder(moduleFile);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
 
         session.executeCommandSeq({
             command: ts.server.protocol.CommandTypes.ReloadProjects
@@ -146,7 +146,7 @@ describe("unittests:: tsserver:: reloadProjects", () => {
 
         // Install module1
         host.ensureFileOrFolder(moduleFile);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
 
         session.executeCommandSeq({
             command: ts.server.protocol.CommandTypes.ReloadProjects
diff --git a/src/testRunner/unittests/tsserver/resolutionCache.ts b/src/testRunner/unittests/tsserver/resolutionCache.ts
index 4465ca0185b42..06b1d7fe56bbc 100644
--- a/src/testRunner/unittests/tsserver/resolutionCache.ts
+++ b/src/testRunner/unittests/tsserver/resolutionCache.ts
@@ -138,7 +138,7 @@ describe("unittests:: tsserver:: resolutionCache:: tsserverProjectSystem add the
             }
         });
 
-        verifyGetErrRequest({ session, host, files: [file1] });
+        verifyGetErrRequest({ session, files: [file1] });
 
         const padIndex: File = {
             path: `${folderPath}/node_modules/@types/pad/index.d.ts`,
@@ -166,8 +166,7 @@ describe("unittests:: tsserver:: resolutionCache:: tsserverProjectSystem add the
             arguments: { file: file.path, fileContent: file.content },
         });
 
-        host.checkTimeoutQueueLength(0);
-        verifyGetErrRequest({ session, host, files: [file] });
+        verifyGetErrRequest({ session, files: [file] });
         baselineTsserverLogs("resolutionCache", `suggestion diagnostics`, session);
     });
 
@@ -192,8 +191,7 @@ describe("unittests:: tsserver:: resolutionCache:: tsserverProjectSystem add the
             },
         });
 
-        host.checkTimeoutQueueLength(0);
-        verifyGetErrRequest({ session, host, files: [file], skip: [{ suggestion: true }] });
+        verifyGetErrRequest({ session, files: [file], skip: [{ suggestion: true }] });
         baselineTsserverLogs("resolutionCache", `disable suggestion diagnostics`, session);
     });
 
@@ -211,7 +209,7 @@ describe("unittests:: tsserver:: resolutionCache:: tsserverProjectSystem add the
             arguments: { file: file.path, fileContent: file.content },
         });
 
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
         session.executeCommandSeq<ts.server.protocol.GeterrRequest>({
             command: ts.server.protocol.CommandTypes.Geterr,
             arguments: {
@@ -220,7 +218,7 @@ describe("unittests:: tsserver:: resolutionCache:: tsserverProjectSystem add the
             }
         });
 
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
         session.executeCommandSeq<ts.server.protocol.GeterrForProjectRequest>({
             command: ts.server.protocol.CommandTypes.GeterrForProject,
             arguments: {
@@ -229,7 +227,7 @@ describe("unittests:: tsserver:: resolutionCache:: tsserverProjectSystem add the
             }
         });
 
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
         baselineTsserverLogs("resolutionCache", "suppressed diagnostic events", session);
     });
 });
@@ -585,10 +583,10 @@ export const x = 10;`
             const host = createServerHost(files);
             const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
             service.openClientFile(file1.path);
-            host.checkTimeoutQueueLength(0);
+            service.testhost.logTimeoutQueueLength();
 
             host.ensureFileOrFolder(npmCacheFile);
-            host.checkTimeoutQueueLength(0);
+            service.testhost.logTimeoutQueueLength();
             baselineTsserverLogs("resolutionCache", "when watching node_modules in inferred project for failed lookup/closed script infos", service);
         });
         it("when watching node_modules as part of wild card directories in config project", () => {
@@ -600,10 +598,10 @@ export const x = 10;`
             const host = createServerHost(files);
             const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs(host) });
             service.openClientFile(file1.path);
-            host.checkTimeoutQueueLength(0);
+            service.testhost.logTimeoutQueueLength();
 
             host.ensureFileOrFolder(npmCacheFile);
-            host.checkTimeoutQueueLength(0);
+            service.testhost.logTimeoutQueueLength();
             baselineTsserverLogs("resolutionCache", "when watching node_modules as part of wild card directories in config project", service);
         });
     });
@@ -623,7 +621,7 @@ export const x = 10;`
 
             // invoke callback to simulate saving
             host.modifyFile(file1.path, file1.content, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
-            host.checkTimeoutQueueLengthAndRun(0);
+            host.runQueuedTimeoutCallbacks();
             baselineTsserverLogs("resolutionCache", "avoid unnecessary lookup invalidation on save", service);
         });
     });
diff --git a/src/testRunner/unittests/tsserver/symLinks.ts b/src/testRunner/unittests/tsserver/symLinks.ts
index 33e0ac5e7a9e3..74e98786950a0 100644
--- a/src/testRunner/unittests/tsserver/symLinks.ts
+++ b/src/testRunner/unittests/tsserver/symLinks.ts
@@ -141,14 +141,14 @@ new C();`
                 it("when project compiles from sources", () => {
                     const host = createServerHost(filesWithSources);
                     const session = createSessionAndOpenFile(host);
-                    verifyGetErrRequest({ session, host, files: [recognizersDateTimeSrcFile] });
+                    verifyGetErrRequest({ session, files: [recognizersDateTimeSrcFile] });
 
                     host.ensureFileOrFolder(nodeModulesRecorgnizersText);
                     host.writeFile(recongnizerTextDistTypingFile.path, recongnizerTextDistTypingFile.content);
                     host.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions
                     host.runQueuedTimeoutCallbacks(); // Actual update
 
-                    verifyGetErrRequest({ session, host, files: [recognizersDateTimeSrcFile] });
+                    verifyGetErrRequest({ session, files: [recognizersDateTimeSrcFile] });
 
                     // Change config file's module resolution affecting option
                     const config = JSON.parse(host.readFile(recognizerDateTimeTsconfigPath)!);
@@ -165,13 +165,13 @@ new C();`
                 it("when project has node_modules setup but doesnt have modules in typings folder and then recompiles", () => {
                     const host = createServerHost([...filesWithSources, nodeModulesRecorgnizersText]);
                     const session = createSessionAndOpenFile(host);
-                    verifyGetErrRequest({ session, host, files: [recognizersDateTimeSrcFile] });
+                    verifyGetErrRequest({ session, files: [recognizersDateTimeSrcFile] });
 
                     host.writeFile(recongnizerTextDistTypingFile.path, recongnizerTextDistTypingFile.content);
                     host.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions
                     host.runQueuedTimeoutCallbacks(); // Actual update
 
-                    verifyGetErrRequest({ session, host, files: [recognizersDateTimeSrcFile] });
+                    verifyGetErrRequest({ session, files: [recognizersDateTimeSrcFile] });
                     baselineTsserverLogs("symLinks", `module resolution${withPathMapping ? " with path mapping" : ""} when project has node_modules setup but doesnt have modules in typings folder and then recompiles`, session);
                 });
 
@@ -179,19 +179,19 @@ new C();`
                     const host = createServerHost([...filesWithSources, nodeModulesRecorgnizersText, recongnizerTextDistTypingFile]);
                     const session = createSessionAndOpenFile(host);
 
-                    verifyGetErrRequest({ session, host, files: [recognizersDateTimeSrcFile] });
+                    verifyGetErrRequest({ session, files: [recognizersDateTimeSrcFile] });
 
                     host.deleteFolder(recognizersTextDist, /*recursive*/ true);
                     host.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions
                     host.runQueuedTimeoutCallbacks(); // Actual update
 
-                    verifyGetErrRequest({ session, host, files: [recognizersDateTimeSrcFile] });
+                    verifyGetErrRequest({ session, files: [recognizersDateTimeSrcFile] });
 
                     host.ensureFileOrFolder(recongnizerTextDistTypingFile);
                     host.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions
                     host.runQueuedTimeoutCallbacks(); // Actual update
 
-                    verifyGetErrRequest({ session, host, files: [recognizersDateTimeSrcFile] });
+                    verifyGetErrRequest({ session, files: [recognizersDateTimeSrcFile] });
                     baselineTsserverLogs("symLinks", `module resolution${withPathMapping ? " with path mapping" : ""} when project recompiles after deleting generated folders`, session);
                 });
             });
diff --git a/src/testRunner/unittests/tsserver/syntaxOperations.ts b/src/testRunner/unittests/tsserver/syntaxOperations.ts
index fc7bc01088c02..b25223377f6cb 100644
--- a/src/testRunner/unittests/tsserver/syntaxOperations.ts
+++ b/src/testRunner/unittests/tsserver/syntaxOperations.ts
@@ -51,13 +51,13 @@ describe("Test Suite 1", () => {
             arguments: { file: unitTest1.path }
         });
         host.deleteFile(unitTest1.path);
-        host.checkTimeoutQueueLengthAndRun(0);
+        host.runQueuedTimeoutCallbacks();
 
         session.executeCommandSeq<ts.server.protocol.CloseRequest>({
             command: ts.server.protocol.CommandTypes.Close,
             arguments: { file: unitTest1.path }
         });
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         const unitTest1WithChangedContent: File = {
             path: unitTest1.path,
diff --git a/src/testRunner/unittests/tsserver/typeReferenceDirectives.ts b/src/testRunner/unittests/tsserver/typeReferenceDirectives.ts
index a784bbd178145..40f69969667b8 100644
--- a/src/testRunner/unittests/tsserver/typeReferenceDirectives.ts
+++ b/src/testRunner/unittests/tsserver/typeReferenceDirectives.ts
@@ -61,7 +61,7 @@ declare class TestLib {
         const session = createSession(host, { logger: createLoggerWithInMemoryLogs(host) });
         openFilesForSession([testFile], session);
         host.writeFile(appLib.path, appLib.content.replace("test()", "test2()"));
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typeReferenceDirectives", "when typeReferenceDirective contains UpperCasePackage", session);
     });
 
diff --git a/src/testRunner/unittests/tsserver/typingsInstaller.ts b/src/testRunner/unittests/tsserver/typingsInstaller.ts
index 28cd703e36139..05cafb1a711ff 100644
--- a/src/testRunner/unittests/tsserver/typingsInstaller.ts
+++ b/src/testRunner/unittests/tsserver/typingsInstaller.ts
@@ -184,7 +184,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         projectService.openClientFile(file1.path);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "configured projects", projectService);
     });
 
@@ -220,7 +220,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         projectService.openClientFile(file1.path);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         baselineTsserverLogs("typingsInstaller", "inferred projects", projectService);
     });
@@ -251,7 +251,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         projectService.openClientFile(jqueryJs.path);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLength(0);
+        projectService.testhost.logTimeoutQueueLength();
         // files should not be removed from project if ATA is skipped
 
         baselineTsserverLogs("typingsInstaller", "inferred projects with disableFilenameBasedTypeAcquisition", projectService);
@@ -425,7 +425,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
 
         typingsInstaller.installer.executePendingCommands();
 
-        host.checkTimeoutQueueLengthAndRun(1);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "external projects no type acquisition", projectService);
     });
 
@@ -586,7 +586,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
 
         typingsInstaller.installer.executePendingCommands();
 
-        host.checkTimeoutQueueLengthAndRun(1);
+        host.runQueuedTimeoutCallbacks();
         // Commander: Existed as a JS file
         // JQuery: Specified in 'include'
         // Moment: Specified in 'include'
@@ -659,7 +659,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         });
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(1);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "throttle delayed typings to install", projectService);
     });
 
@@ -754,7 +754,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         assert.equal(typingsInstaller.installer.pendingRunRequests.length, 0, "expected no throttled requests");
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2); // for 2 projects
+        host.runQueuedTimeoutCallbacks(); // for 2 projects
         baselineTsserverLogs("typingsInstaller", "throttle delayed run install requests", projectService);
     });
 
@@ -812,7 +812,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
 
         typingsInstaller.installer.executePendingCommands();
 
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "scoped name discovery", projectService);
     });
 
@@ -943,7 +943,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
 
         typingsInstaller.installer.executePendingCommands();
 
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "configured projects discover from bower_components", projectService);
     });
 
@@ -982,7 +982,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
 
         typingsInstaller.installer.executePendingCommands();
 
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "discover from bower", projectService);
     });
 
@@ -1016,10 +1016,10 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         service.openClientFile(f.path);
 
         host.writeFile(fixedPackageJson.path, fixedPackageJson.content);
-        host.checkTimeoutQueueLength(0);
+        service.testhost.logTimeoutQueueLength();
         // expected install request
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "malformed packagejson", service);
     });
 
@@ -1058,7 +1058,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
 
         typingsInstaller.installer.executePendingCommands();
 
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "install typings for unresolved imports", service);
     });
 
@@ -1091,7 +1091,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         service.openClientFile(file.path);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "redo resolutions pointing to js on typing install", service);
     });
 
@@ -1167,7 +1167,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
             }
         };
         session.executeCommandSeq(changeRequest);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
         proj.updateGraph();
         const version2 = proj.lastCachedUnresolvedImportsList;
         assert.strictEqual(version1, version2, "set of unresolved imports should change");
@@ -1226,7 +1226,7 @@ describe("unittests:: tsserver:: typingsInstaller:: General functionality", () =
         projectService.openClientFile(file1.path);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "expired cache entry", projectService);
     });
 
@@ -1625,7 +1625,7 @@ describe("unittests:: tsserver:: typingsInstaller:: telemetry events", () => {
         projectService.openClientFile(f1.path);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "telemetry events", projectService);
     });
 });
@@ -1667,7 +1667,7 @@ describe("unittests:: tsserver:: typingsInstaller:: progress notifications", ()
         projectService.openClientFile(f1.path);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         baselineTsserverLogs("typingsInstaller", "progress notification", projectService);
     });
 
@@ -1762,7 +1762,7 @@ describe("unittests:: tsserver:: typingsInstaller:: recomputing resolutions of u
         const foooResolution1 = verifyResolvedModuleOfFooo(proj);
 
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         const foooResolution2 = verifyResolvedModuleOfFooo(proj);
         assert.strictEqual(foooResolution1, foooResolution2);
         projectService.applyChangesInOpenFiles(/*openFiles*/ undefined, [{
@@ -1774,7 +1774,7 @@ describe("unittests:: tsserver:: typingsInstaller:: recomputing resolutions of u
         }]);
         host.runQueuedTimeoutCallbacks(); // Update the graph
         // Update the typing
-        host.checkTimeoutQueueLength(0);
+        projectService.testhost.logTimeoutQueueLength();
         assert.isFalse(proj.resolutionCache.isFileWithInvalidatedNonRelativeUnresolvedImports(app.path as ts.Path));
         baselineTsserverLogs("typingsInstaller", scenario, projectService);
     }
@@ -1842,7 +1842,7 @@ declare module "stream" {
 
         const proj = projectService.inferredProjects[0];
         typingsInstaller.installer.executePendingCommands();
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
         projectService.applyChangesInOpenFiles(
             /*openFiles*/ undefined,
             [{
@@ -1859,10 +1859,10 @@ declare module "stream" {
         );
         // Below timeout Updates the typings to empty array because of "s tream" as unsresolved import
         // and schedules the update graph because of this.
-        host.checkTimeoutQueueLengthAndRun(2);
+        host.runQueuedTimeoutCallbacks();
 
         // Here, since typings dont change, there is no timeout scheduled
-        host.checkTimeoutQueueLength(0);
+        projectService.testhost.logTimeoutQueueLength();
         projectService.applyChangesInOpenFiles(/*openFiles*/ undefined, [{
             fileName: file.path,
             changes: [{
@@ -1872,7 +1872,7 @@ declare module "stream" {
         }]);
         proj.updateGraph(); // Update the graph
         // Update the typing
-        host.checkTimeoutQueueLength(0);
+        projectService.testhost.logTimeoutQueueLength();
         assert.isFalse(proj.resolutionCache.isFileWithInvalidatedNonRelativeUnresolvedImports(file.path as ts.Path));
         baselineTsserverLogs("typingsInstaller", "should handle node core modules", projectService);
     });
diff --git a/src/testRunner/unittests/tsserver/watchEnvironment.ts b/src/testRunner/unittests/tsserver/watchEnvironment.ts
index affbf695cb5bc..ea7e84cf4c54a 100644
--- a/src/testRunner/unittests/tsserver/watchEnvironment.ts
+++ b/src/testRunner/unittests/tsserver/watchEnvironment.ts
@@ -172,7 +172,7 @@ it(`unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem recursive wa
         emacsIgnoredFileFromIgnoreDirectory
     ].forEach(ignoredEntity => {
         host.ensureFileOrFolder(ignoredEntity);
-        host.checkTimeoutQueueLength(0);
+        session.testhost.logTimeoutQueueLength();
     });
 
     baselineTsserverLogs("watchEnvironment", `recursive directory does not watch files starting with dot in node_modules`, session);
diff --git a/src/testRunner/unittests/virtualFileSystemWithWatch.ts b/src/testRunner/unittests/virtualFileSystemWithWatch.ts
index a1c45b088b28f..3873a36051c85 100644
--- a/src/testRunner/unittests/virtualFileSystemWithWatch.ts
+++ b/src/testRunner/unittests/virtualFileSystemWithWatch.ts
@@ -167,10 +167,10 @@ interface CallbackData {
     time: number;
 }
 class Callbacks {
-    private map: { cb: TimeOutCallback; args: any[]; ms: number | undefined; time: number; }[] = [];
+    readonly map: CallbackData[] = [];
     private nextId = 1;
 
-    constructor(private host: TestServerHost) {
+    constructor(private host: TestServerHost, readonly callbackType: string) {
     }
 
     getNextId() {
@@ -190,15 +190,17 @@ class Callbacks {
         }
     }
 
-    count() {
-        let n = 0;
-        for (const _ in this.map) {
-            n++;
+    log() {
+        const details: string[] = [];
+        for (const timeoutId in this.map) {
+            const { args } = this.map[Number(timeoutId)];
+            details.push(`${timeoutId}: ${args[0]}`);
         }
-        return n;
+        return `${this.callbackType} callback:: count: ${details.length}` + (details.length ? "\r\n" + details.join("\r\n") : "");
     }
 
-    private invokeCallback({ cb, args, ms, time }: CallbackData) {
+    private invokeCallback(timeoutId: number) {
+        const { cb, args, ms, time } = this.map[timeoutId];
         if (ms !== undefined) {
             const newTime = ms + time;
             if (this.host.getTime() < newTime) {
@@ -206,21 +208,17 @@ class Callbacks {
             }
         }
         cb(...args);
+        delete this.map[timeoutId];
     }
 
     invoke(invokeKey?: number) {
-        if (invokeKey) {
-            this.invokeCallback(this.map[invokeKey]);
-            delete this.map[invokeKey];
-            return;
-        }
+        if (invokeKey) return this.invokeCallback(invokeKey);
 
         // Note: invoking a callback may result in new callbacks been queued,
         // so do not clear the entire callback list regardless. Only remove the
         // ones we have invoked.
         for (const key in this.map) {
-            this.invokeCallback(this.map[key]);
-            delete this.map[key];
+            this.invokeCallback(Number(key));
         }
     }
 }
@@ -280,8 +278,8 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost,
     private time = timeIncrements;
     getCanonicalFileName: (s: string) => string;
     private toPath: (f: string) => Path;
-    private timeoutCallbacks = new Callbacks(this);
-    private immediateCallbacks = new Callbacks(this);
+    readonly timeoutCallbacks = new Callbacks(this, "Timeout");
+    readonly immediateCallbacks = new Callbacks(this, "Immedidate");
     readonly screenClears: number[] = [];
 
     readonly watchedFiles = createMultiMap<Path, TestFileWatcher>();
@@ -869,16 +867,6 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost,
         this.screenClears.push(this.output.length);
     }
 
-    checkTimeoutQueueLengthAndRun(expected: number) {
-        this.checkTimeoutQueueLength(expected);
-        this.runQueuedTimeoutCallbacks();
-    }
-
-    checkTimeoutQueueLength(expected: number) {
-        const callbacksCount = this.timeoutCallbacks.count();
-        assert.equal(callbacksCount, expected, `expected ${expected} timeout callbacks queued but found ${callbacksCount}.`);
-    }
-
     runQueuedTimeoutCallbacks(timeoutId?: number) {
         try {
             this.timeoutCallbacks.invoke(timeoutId);
@@ -891,10 +879,7 @@ export class TestServerHost implements server.ServerHost, FormatDiagnosticsHost,
         }
     }
 
-    runQueuedImmediateCallbacks(checkCount?: number) {
-        if (checkCount !== undefined) {
-            assert.equal(this.immediateCallbacks.count(), checkCount);
-        }
+    runQueuedImmediateCallbacks() {
         this.immediateCallbacks.invoke();
     }
 
diff --git a/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js b/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js
index 5f5b0370f3e39..bcdd7567a9dee 100644
--- a/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js
+++ b/tests/baselines/reference/tsbuildWatch/configFileErrors/reports-syntax-errors-in-config-file.js
@@ -145,6 +145,9 @@ Input::
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
@@ -180,6 +183,9 @@ Input::
 export function fooBar() { }
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
@@ -275,6 +281,9 @@ Change:: reports error when there is no change to tsconfig file
 Input::
 //// [/user/username/projects/myproject/tsconfig.json] file written with same contents
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
@@ -310,6 +319,9 @@ Input::
 {"compilerOptions":{"composite":true,"declaration":true},"files":["a.ts","b.ts"]}
 
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:56 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
index b68155745f228..d1d200e5e543f 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
@@ -449,6 +449,9 @@ export function lastElementOf<T>(arr: T[]): T | undefined {
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index b97ab3a896ad3..7ad14ffe50c18 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -214,6 +214,13 @@ Input::
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index 0601c7e75a587..e314e2b405c0d 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -297,6 +297,9 @@ Input::
 {"name":"pkg2","version":"1.0.0","main":"build/other.js"}
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
@@ -362,6 +365,9 @@ Input::
 {"name":"pkg2","version":"1.0.0","main":"build/index.js"}
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index 07c64f6f067f3..89ef60c3b40a2 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -292,6 +292,9 @@ Input::
 {"name":"pkg1","version":"1.0.0","main":"build/index.js","type":"commonjs"}
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
@@ -374,6 +377,9 @@ Input::
 {"name":"pkg1","version":"1.0.0","main":"build/index.js","type":"module"}
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:20 AM] File change detected. Starting incremental compilation...
@@ -448,6 +454,9 @@ Input::
 {"name":"pkg1","version":"1.0.0","main":"build/index.js","type":"commonjs"}
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
@@ -534,6 +543,13 @@ export type { TheNum } from './const.cjs';
 
 //// [/user/username/projects/myproject/packages/pkg2/index.ts] deleted
 
+Before running Timeout callback:: count: 1
+8: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js b/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
index f6a213d998bd2..01a71ca749add 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolutionCache/handles-the-cache-correctly-when-two-projects-use-different-module-resolution-settings.js
@@ -304,6 +304,9 @@ Input::
 import { foo } from "file";const bar = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:18 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index ef0dad4f975be..5869b093322a9 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -141,6 +141,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -161,6 +164,9 @@ Input::
 const x = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index dd70b5dc227fd..d3aa22a7b1e84 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -79,6 +79,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
@@ -113,6 +116,9 @@ Input::
 const x = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 8a462a417e04e..ca223f82f11f4 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -179,6 +179,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
@@ -222,6 +225,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -371,6 +377,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:22 AM] File change detected. Starting incremental compilation...
@@ -515,6 +524,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:37 AM] File change detected. Starting incremental compilation...
@@ -556,6 +568,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
@@ -683,6 +698,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:01 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
index 692cb1dbe7a4c..d1c82655d8782 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -96,6 +96,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -139,6 +142,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -202,6 +208,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:10 AM] File change detected. Starting incremental compilation...
@@ -242,6 +251,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:18 AM] File change detected. Starting incremental compilation...
@@ -283,6 +295,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
@@ -328,6 +343,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:38 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index bc31edcb790a3..ef1c138b297aa 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -550,6 +550,9 @@ export const m = mod;
 function someFn() { }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
@@ -699,6 +702,13 @@ export const m = mod;
 export function someFn() { }
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:57 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
index 54d69e3120b5c..c0d6273c1178f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
@@ -179,6 +179,9 @@ export var myClassWithError = class {
     };
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
@@ -216,6 +219,9 @@ Input::
 export class myClass2 { }
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
index 0849da873c898..94fb6d142608d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
@@ -179,6 +179,9 @@ export var myClassWithError = class {
     };
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
@@ -219,6 +222,9 @@ export var myClassWithError = class {
     };
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
index bc1732c97555a..239e76454cd89 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
@@ -80,6 +80,9 @@ Input::
 export class myClass2 { }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
index c2ae0dc61cf23..8a49629350655 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
@@ -83,6 +83,9 @@ export var myClassWithError = class {
     };
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index 4b2eb05d06b89..9ea78ac785b42 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -533,6 +533,9 @@ export const m = mod;
 let y: string = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
@@ -676,6 +679,9 @@ export function multiply(a: number, b: number) { return a * b; }
 let x: string = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index cf157f2ed83ab..faf5c70abc9e9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -532,6 +532,9 @@ export const m = mod;
 let y: string = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
@@ -674,6 +677,9 @@ export function multiply(a: number, b: number) { return a * b; }
 let x: string = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:39 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
index da8fd8ce2d2f9..235c81e3263a4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
@@ -173,6 +173,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -185,6 +187,9 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
@@ -322,6 +327,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
index a7da38d922d17..72ce1f1a30ac6 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
@@ -188,6 +188,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -200,6 +202,9 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:51 AM] File change detected. Starting incremental compilation...
@@ -342,6 +347,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
index 24f0415852cbe..c9849bc05d767 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
@@ -263,6 +263,10 @@ FsWatchesRecursive::
 /user/username/projects/sample1/core:
   {}
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
 Output::
 sysLog:: /user/username/projects/sample1/logic/tsconfig.json:: Changing watcher to PresentFileSystemEntryWatcher
 
@@ -426,6 +430,9 @@ Change:: Build Tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:19 AM] Found 0 errors. Watching for file changes.
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
index 74ca650d5e4f9..5a531887b152d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
@@ -194,6 +194,13 @@ export function createSomeObject(): SomeObject
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -332,6 +339,13 @@ export function createSomeObject(): SomeObject
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
index 8a17b64a93aec..5c814bbc42929 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
@@ -293,6 +293,10 @@ function foo() { return 10; }
 function myFunc() { return 10; }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:00:56 AM] File change detected. Starting incremental compilation...
@@ -403,6 +407,9 @@ Change:: Build logic
 
 Input::
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
@@ -561,6 +568,10 @@ function foo() { return 10; }
 function myFunc() { return 100; }
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:33 AM] File change detected. Starting incremental compilation...
@@ -666,6 +677,9 @@ Change:: Build logic
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:02:00 AM] Found 0 errors. Watching for file changes.
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 2dd74a66715ab..a908a07a61aa8 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -492,6 +492,10 @@ Input::
 export const newFileConst = 30;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
@@ -633,6 +637,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
@@ -678,6 +685,10 @@ export const newFileConst = 30;
 export class someClass2 { }
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
@@ -803,6 +814,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:50 AM] Found 0 errors. Watching for file changes.
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index 6b9142bcb00a7..ff50303ac6600 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -496,6 +496,10 @@ export function multiply(a: number, b: number) { return a * b; }
 export class someClass { }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -613,6 +617,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:54 AM] Found 0 errors. Watching for file changes.
 
@@ -848,6 +855,10 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:58 AM] File change detected. Starting incremental compilation...
@@ -957,6 +968,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:02:35 AM] Found 0 errors. Watching for file changes.
 
@@ -1194,6 +1208,10 @@ export class someClass { }
 export class someClass2 { }
 
 
+Before running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:02:42 AM] File change detected. Starting incremental compilation...
@@ -1319,6 +1337,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:03:20 AM] Found 0 errors. Watching for file changes.
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index ef43d8a598114..72296fe5c448f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -496,6 +496,9 @@ export function multiply(a: number, b: number) { return a * b; }
 function foo() { }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 602d7c3206434..3d812a846ea64 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -526,6 +526,10 @@ Input::
 export const newFileConst = 30;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:26 AM] File change detected. Starting incremental compilation...
@@ -672,6 +676,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:42 AM] Found 0 errors. Watching for file changes.
 
@@ -717,6 +724,10 @@ export const newFileConst = 30;
 export class someClass2 { }
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:46 AM] File change detected. Starting incremental compilation...
@@ -847,6 +858,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:02:05 AM] Found 0 errors. Watching for file changes.
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index 93b38825a0d8b..45f3b30f183c9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -530,6 +530,10 @@ export function multiply(a: number, b: number) { return a * b; }
 export class someClass { }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
@@ -652,6 +656,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:02:07 AM] Found 0 errors. Watching for file changes.
 
@@ -887,6 +894,10 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:02:11 AM] File change detected. Starting incremental compilation...
@@ -1001,6 +1012,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:02:51 AM] Found 0 errors. Watching for file changes.
 
@@ -1238,6 +1252,10 @@ export class someClass { }
 export class someClass2 { }
 
 
+Before running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:02:58 AM] File change detected. Starting incremental compilation...
@@ -1368,6 +1386,9 @@ Change:: Build logic and tests
 
 Input::
 
+Before running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:03:39 AM] Found 0 errors. Watching for file changes.
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index 34e59ca304faf..9ba0aa2e0cdcd 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -530,6 +530,9 @@ export function multiply(a: number, b: number) { return a * b; }
 function foo() { }
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js
index 99fe740e48f99..40aa86b2a3223 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-correctly-when-project-with-extended-config-is-removed.js
@@ -270,6 +270,9 @@ Input::
 {"references":[{"path":"./project1.tsconfig.json"}],"files":[]}
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
index 3b1473374cef7..0f3e85e01c297 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
@@ -69,6 +69,9 @@ Input::
 {"compilerOptions":{"noUnusedParameters":false}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
index 734216db21131..78784727d6dae 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
@@ -308,6 +308,10 @@ Input::
 {"compilerOptions":{"strict":true}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
@@ -419,6 +423,9 @@ Change:: Build project 2
 
 Input::
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:28 AM] Project 'project2.tsconfig.json' is out of date because output 'project2.tsconfig.tsbuildinfo' is older than input 'alpha.tsconfig.json'
 
@@ -509,6 +516,9 @@ Input::
 {"extends":"./alpha.tsconfig.json","compilerOptions":{"strict":false}}
 
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
@@ -601,6 +611,9 @@ Input::
 {"extends":"./alpha.tsconfig.json"}
 
 
+Before running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:01 AM] File change detected. Starting incremental compilation...
@@ -690,6 +703,10 @@ Input::
 {}
 
 
+Before running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+8: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:02:22 AM] File change detected. Starting incremental compilation...
@@ -798,6 +815,9 @@ Change:: Build project 2
 
 Input::
 
+Before running Timeout callback:: count: 1
+8: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:02:38 AM] Project 'project2.tsconfig.json' is out of date because output 'commonFile1.js' is older than input 'alpha.tsconfig.json'
 
@@ -846,6 +866,9 @@ Input::
 {"compilerOptions":{"strictNullChecks":true}}
 
 
+Before running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:57 AM] File change detected. Starting incremental compilation...
@@ -884,6 +907,9 @@ Input::
 {"extends":["./extendsConfig1.tsconfig.json","./extendsConfig2.tsconfig.json"],"compilerOptions":{"composite":false},"files":["/a/b/other2.ts"]}
 
 
+Before running Timeout callback:: count: 1
+10: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:03:06 AM] File change detected. Starting incremental compilation...
@@ -950,6 +976,9 @@ Change:: Delete extendedConfigFile2 and report error
 Input::
 //// [/a/b/extendsConfig2.tsconfig.json] deleted
 
+Before running Timeout callback:: count: 1
+11: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:03:13 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
index 6f4a3d0e6c1c9..355056283cb36 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
@@ -2184,6 +2184,9 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:06:55 AM] File change detected. Starting incremental compilation...
@@ -2384,6 +2387,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -2396,6 +2401,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:08:17 AM] File change detected. Starting incremental compilation...
@@ -2490,6 +2499,10 @@ Change:: build pkg1,pkg2,pkg3,pkg4,pkg5
 
 Input::
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 Output::
 [12:08:33 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -2590,6 +2603,10 @@ Change:: build pkg6,pkg7,pkg8,pkg9,pkg10
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
 Output::
 [12:08:53 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -2690,6 +2707,10 @@ Change:: build pkg11,pkg12,pkg13,pkg14,pkg15
 
 Input::
 
+Before running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
 Output::
 [12:09:13 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -2790,6 +2811,10 @@ Change:: build pkg16,pkg17,pkg18,pkg19,pkg20
 
 Input::
 
+Before running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
 Output::
 [12:09:33 AM] Project 'pkg16/tsconfig.json' is out of date because output 'pkg16/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -2890,6 +2915,9 @@ Change:: build pkg21,pkg22,pkg23
 
 Input::
 
+Before running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:09:54 AM] Project 'pkg21/tsconfig.json' is out of date because output 'pkg21/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -2938,6 +2966,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -2950,6 +2980,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export const someConst3 = 10;
 
 
+Before running Timeout callback:: count: 1
+8: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:10:05 AM] File change detected. Starting incremental compilation...
@@ -3046,6 +3080,10 @@ Change:: build pkg1,pkg2,pkg3,pkg4,pkg5
 
 Input::
 
+Before running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+10: timerToBuildInvalidatedProject
 Output::
 [12:10:21 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -3146,6 +3184,10 @@ Change:: build pkg6,pkg7,pkg8,pkg9,pkg10
 
 Input::
 
+Before running Timeout callback:: count: 1
+10: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+11: timerToBuildInvalidatedProject
 Output::
 [12:10:41 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -3249,6 +3291,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export const someConst3 = 10;const someConst4 = 10;
 
 
+Before running Timeout callback:: count: 1
+12: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+13: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:11:03 AM] File change detected. Starting incremental compilation...
@@ -3390,6 +3436,10 @@ Change:: build pkg11,pkg12,pkg13,pkg14,pkg15
 
 Input::
 
+Before running Timeout callback:: count: 1
+13: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+14: timerToBuildInvalidatedProject
 Output::
 [12:11:46 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -3493,6 +3543,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export const someConst3 = 10;const someConst4 = 10;export const someConst5 = 10;
 
 
+Before running Timeout callback:: count: 1
+15: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+16: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:12:09 AM] File change detected. Starting incremental compilation...
@@ -3592,6 +3646,10 @@ Change:: build pkg1,pkg2,pkg3,pkg4,pkg5
 
 Input::
 
+Before running Timeout callback:: count: 1
+16: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+17: timerToBuildInvalidatedProject
 Output::
 [12:12:25 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -3692,6 +3750,10 @@ Change:: build pkg6,pkg7,pkg8,pkg9,pkg10
 
 Input::
 
+Before running Timeout callback:: count: 1
+17: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+18: timerToBuildInvalidatedProject
 Output::
 [12:12:45 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -3792,6 +3854,10 @@ Change:: build pkg11,pkg12,pkg13,pkg14,pkg15
 
 Input::
 
+Before running Timeout callback:: count: 1
+18: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+19: timerToBuildInvalidatedProject
 Output::
 [12:13:05 AM] Project 'pkg11/tsconfig.json' is out of date because output 'pkg11/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -3892,6 +3958,10 @@ Change:: build pkg16,pkg17,pkg18,pkg19,pkg20
 
 Input::
 
+Before running Timeout callback:: count: 1
+19: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+20: timerToBuildInvalidatedProject
 Output::
 [12:13:25 AM] Project 'pkg16/tsconfig.json' is out of date because output 'pkg16/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -3992,6 +4062,9 @@ Change:: build pkg21,pkg22,pkg23
 
 Input::
 
+Before running Timeout callback:: count: 1
+20: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:13:45 AM] Project 'pkg21/tsconfig.json' is out of date because output 'pkg21/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -4040,6 +4113,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
index 156efd0540771..387a721661539 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
@@ -324,6 +324,9 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
@@ -424,6 +427,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -436,6 +441,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:01:37 AM] File change detected. Starting incremental compilation...
@@ -530,6 +539,9 @@ Change:: build pkg1,pkg2
 
 Input::
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:01:53 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -578,6 +590,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
index 4333b2715e2de..89afc315cb803 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
@@ -510,6 +510,9 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:49 AM] File change detected. Starting incremental compilation...
@@ -620,6 +623,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -632,6 +637,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
@@ -726,6 +735,9 @@ Change:: build pkg1,pkg2,pkg3,pkg4
 
 Input::
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:02:33 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -810,6 +822,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
index 75c46c2b2d909..e7800c76107c7 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
@@ -789,6 +789,9 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:40 AM] File change detected. Starting incremental compilation...
@@ -914,6 +917,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -926,6 +931,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:03:17 AM] File change detected. Starting incremental compilation...
@@ -1020,6 +1029,10 @@ Change:: build pkg1,pkg2,pkg3,pkg4,pkg5
 
 Input::
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
 Output::
 [12:03:33 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -1120,6 +1133,9 @@ Change:: build pkg6,pkg7
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:03:53 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -1168,6 +1184,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -1180,6 +1198,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export const someConst3 = 10;
 
 
+Before running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:04:04 AM] File change detected. Starting incremental compilation...
@@ -1276,6 +1298,10 @@ Change:: build pkg1,pkg2,pkg3,pkg4,pkg5
 
 Input::
 
+Before running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+7: timerToBuildInvalidatedProject
 Output::
 [12:04:21 AM] Project 'pkg1/tsconfig.json' is out of date because output 'pkg1/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -1379,6 +1405,10 @@ Input::
 export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export const someConst3 = 10;const someConst4 = 10;
 
 
+Before running Timeout callback:: count: 1
+8: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
 Output::
 >> Screen clear
 [12:04:43 AM] File change detected. Starting incremental compilation...
@@ -1495,6 +1525,9 @@ Change:: build pkg6,pkg7
 
 Input::
 
+Before running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 [12:05:11 AM] Project 'pkg6/tsconfig.json' is out of date because output 'pkg6/index.js' is older than input 'pkg0/tsconfig.json'
 
@@ -1543,6 +1576,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
index 9dd1fcd1e4a2b..1233faa7415c3 100644
--- a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
+++ b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
@@ -288,6 +288,13 @@ export enum e { }
 export function f2() { } // trailing
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
index ef14690b9d764..9aa7e998717d9 100644
--- a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
+++ b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
@@ -283,6 +283,13 @@ export interface Session {
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+2: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
@@ -442,6 +449,13 @@ export interface Session {
 
 
 
+Before running Timeout callback:: count: 1
+3: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
index b7253879c901d..7f1a4ab5976d4 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
@@ -218,6 +218,13 @@ Input::
 export const typing = 10;export const typing1 = 10;
 
 
+Before running Timeout callback:: count: 1
+4: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+5: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
@@ -320,6 +327,9 @@ Input::
 {"files":[],"include":[],"references":[{"path":"./pkg0"},{"path":"./pkg1"},{"path":"./pkg2"}]}
 
 
+Before running Timeout callback:: count: 1
+6: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
@@ -374,6 +384,13 @@ Input::
 export const typing = 10;
 
 
+Before running Timeout callback:: count: 1
+9: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 1
+10: timerToBuildInvalidatedProject
+Before running Timeout callback:: count: 1
+10: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
@@ -455,6 +472,9 @@ Input::
 {"files":[],"include":[],"references":[]}
 
 
+Before running Timeout callback:: count: 1
+11: timerToBuildInvalidatedProject
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:57 AM] File change detected. Starting incremental compilation...
@@ -506,6 +526,8 @@ Input::
 export const typing = 10;export const typing1 = 10;
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
index 761b8152a3bf5..7a09ae2429225 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
@@ -69,6 +69,9 @@ Input::
 //
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
index c52b9b299f8bb..83690ce12eb5e 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
@@ -68,6 +68,9 @@ Input::
 //
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js b/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js
index 5523e79d5c861..c468e45f4a70b 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/with---diagnostics.js
@@ -64,6 +64,9 @@ Input::
 //
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /f.ts 1:: WatchInfo: /f.ts 250 undefined Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js b/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js
index 7867b655cb5f0..033fa988be0d1 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/with---extendedDiagnostics.js
@@ -66,6 +66,9 @@ Input::
 //
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /f.ts 1:: WatchInfo: /f.ts 250 undefined Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js b/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js
index 241a9b39b6243..91935887be763 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/with---preserveWatchOutput.js
@@ -59,6 +59,9 @@ Input::
 //
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 [12:00:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js b/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js
index 00ba60dd83e4f..8261a8a3b3a01 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/without---diagnostics-or---extendedDiagnostics.js
@@ -60,6 +60,9 @@ Input::
 //
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:17 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js
index c8f9bec6c1244..c360f7958ecad 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/elides-const-enums-correctly-in-incremental-compilation.js
@@ -89,6 +89,9 @@ Input::
 import { E2 } from "./file2"; const v: E2 = E2.V;function foo2() { return 2; }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
index 207d2f104e2da..47213d4740320 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
@@ -75,6 +75,9 @@ var a = 10;
 var b = 10;
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js
index b309feab8fb01..cf61948636287 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js
@@ -65,6 +65,9 @@ var y = 2;
 var z = 3;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:17 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js
index 1c26c3b2b1272..daba959cf9b73 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js
@@ -65,6 +65,9 @@ var y = 2;
 var z = 3;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:17 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
index 6e1aa59512b2f..88e2db977bb20 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
@@ -109,6 +109,9 @@ Input::
 export function Foo() { return 10; }export function foo2() { return 2; }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
@@ -158,6 +161,9 @@ Input::
 export function Foo() { return 10; }export function foo2() { return 2; }export function fooN() { return 2; }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
index ad863971da7e4..0ce7b4d40ab03 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
@@ -134,6 +134,9 @@ Input::
 export var T: number;export function Foo() { };
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index fff079e176e7c..727fac0cb87b8 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -138,6 +138,9 @@ Input::
 export var T: number;export function Foo() { };
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
index 52d6e3913c72d..cdd01b7596dcd 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
@@ -135,6 +135,9 @@ export var T: number;export function Foo() { };
 
 //// [/a/b/file1Consumer2.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
index 65da6077b04c6..8a66bf6ec9a77 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
@@ -137,6 +137,9 @@ export var T: number;export function Foo() { };
 import {Foo} from "./moduleFile1"; let y = Foo();
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
index f3f622658dfdf..da7741131e725 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
@@ -134,6 +134,9 @@ Input::
 export let y = Foo();
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
@@ -181,6 +184,9 @@ Input::
 export var T: number;export function Foo() { };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -233,6 +239,9 @@ Input::
 import {Foo} from "./moduleFile1";let y = Foo();
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
@@ -275,6 +284,9 @@ Input::
 export let y = Foo();
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -339,6 +351,9 @@ export var T: number;export function Foo() { };
 
 //// [/a/b/file1Consumer1.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
index b5523011f319f..b840ddc7c3b5a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
@@ -134,6 +134,9 @@ Input::
 export var T: number;export function Foo() { };
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
@@ -184,6 +187,9 @@ Input::
 export var T: number;export function Foo() { console.log('hi'); };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
index 39eb879f69a92..9f895af9dbc1d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
@@ -99,6 +99,9 @@ Input::
 export var T: number;export function Foo() { };
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
@@ -143,6 +146,9 @@ Input::
 export var T: number;export function Foo() { };var T1: number;
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
index 562480297ffec..d943f33ead722 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
@@ -92,6 +92,9 @@ Input::
 export var x = Foo();export var yy = Foo();
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
@@ -167,6 +170,9 @@ FsWatchesRecursive::
 /a/b:
   {}
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
index 09315d9272401..4259c37021aad 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
@@ -99,6 +99,9 @@ Change:: delete moduleFile1
 Input::
 //// [/a/b/moduleFile1.ts] deleted
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
index 15659d0867295..7e141aeb36913 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
@@ -134,6 +134,9 @@ Input::
 interface GlobalFoo { age: number }var T2: string;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
index 8ca193e7fc6b1..e1ebe9a3a725e 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
@@ -147,6 +147,9 @@ Input::
 import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
@@ -193,6 +196,9 @@ Input::
 export var T: number;export function Foo() { };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
@@ -247,6 +253,9 @@ export var T2: number;export function Foo() { };
 import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;export var T2: number;
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
index 92efcb96cf0fb..3cab0e6adee0b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
@@ -97,6 +97,9 @@ Input::
 export var t1 = 10;export var t3 = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
index 668fd119b6ad6..fbd690ad4e4f1 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
@@ -86,6 +86,9 @@ Input::
 let x = 11
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
@@ -126,6 +129,9 @@ Input::
 let xy = 11
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index cb5c7b01ae030..257940eb0a5c8 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -83,6 +83,9 @@ Input::
 let x = 11
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
@@ -124,6 +127,9 @@ Input::
 let xy = 11
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index f1500acc9e870..d34b0f0590dad 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -77,6 +77,9 @@ Input::
 let x = 11
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
@@ -112,6 +115,9 @@ Input::
 let xy = 11
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index fb0b9a5a3e7ab..d48c856e66fac 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -86,6 +86,9 @@ Input::
 var zz30 = 100;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 5e51c1cccb2ca..caf952f7429f5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -195,6 +195,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -319,6 +322,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
@@ -443,6 +449,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 91fc303bd6ed4..4b0300483e4e0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -109,6 +109,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
@@ -147,6 +150,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
@@ -185,6 +191,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js
index fa289971871c6..ee32109bd6a95 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -220,6 +220,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
@@ -387,6 +390,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
@@ -551,6 +557,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index f5607caa3e1cd..ec222c735ee7f 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -134,6 +134,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -194,6 +197,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
@@ -251,6 +257,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index 750d207098403..e006a1095635b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -347,6 +347,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
@@ -537,6 +540,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
@@ -718,6 +724,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 27abef8d45059..10fbab7fb57f0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,6 +184,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
@@ -239,6 +242,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
@@ -285,6 +291,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
index 98b98d7cfab16..da2677ff191ea 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
@@ -344,6 +344,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -572,6 +575,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
@@ -788,6 +794,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
index 6cfea0d605c55..77ed923bca15e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
@@ -220,6 +220,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -280,6 +283,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -328,6 +334,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
index 0216f5d78f343..fdd0b743baadb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -382,6 +382,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
@@ -633,6 +636,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
@@ -869,6 +875,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
index 894acd5b0d15f..af5383b2ab650 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
@@ -243,6 +243,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -307,6 +310,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
@@ -356,6 +362,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 64cbce8fba8a4..c861aaafa46e2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -196,6 +196,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -211,6 +214,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -343,6 +349,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
@@ -476,6 +485,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -489,6 +501,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:26 AM] File change detected. Starting incremental compilation...
@@ -605,6 +620,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 11f173024b2b8..1c545222e919a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -103,6 +103,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -118,6 +121,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -171,6 +177,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
@@ -207,6 +216,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -220,6 +232,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
@@ -257,6 +272,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index f0daf2d02628d..1f06ef9c007ba 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -201,6 +201,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
@@ -327,6 +330,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
@@ -453,6 +459,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 5093fc10514fb..e60e3800bdf76 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -113,6 +113,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
@@ -151,6 +154,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -189,6 +195,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
index 29d4c5de18b42..af3eb657a1e40 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -247,6 +247,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -402,6 +405,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
@@ -557,6 +563,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 9394b522408c1..6ef9aaa8fbe06 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,6 +151,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
@@ -210,6 +213,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
@@ -269,6 +275,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index fcf02b305ed5c..8808879d3df4b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -395,6 +395,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -650,6 +653,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
@@ -905,6 +911,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index ae70815160b8f..3230e790a5ec1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,6 +214,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -288,6 +291,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
@@ -362,6 +368,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
index 0e3e5dd693a11..565c2e2a1c593 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -397,6 +397,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:10 AM] File change detected. Starting incremental compilation...
@@ -592,6 +595,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:33 AM] File change detected. Starting incremental compilation...
@@ -787,6 +793,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
index b4337dd576268..42a9e8531950e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
@@ -251,6 +251,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -300,6 +303,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
@@ -349,6 +355,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index 5edbc24a4cc7d..dc6d549a3cae3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -448,6 +448,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
@@ -663,6 +666,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
@@ -878,6 +884,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:02 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
index 31bea8d82cec6..fefee22f32dc4 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
@@ -283,6 +283,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
@@ -333,6 +336,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:29 AM] File change detected. Starting incremental compilation...
@@ -383,6 +389,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:46 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 2ca613c4b9432..4d870fb90157b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -197,6 +197,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -212,6 +215,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -367,6 +373,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -509,6 +518,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -522,6 +534,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
@@ -648,6 +663,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index 786966bb09bdd..011f56e23a3a2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -103,6 +103,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -118,6 +121,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -185,6 +191,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -221,6 +230,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -234,6 +246,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
@@ -272,6 +287,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 453f8245ef7e8..b6080b5650c7c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -192,6 +192,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -332,6 +335,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
@@ -455,6 +461,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
index 92f98ee1e1523..daac303b0ebab 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -109,6 +109,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
@@ -154,6 +157,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
@@ -194,6 +200,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js
index aaccd7e0a9790..d13b0b3cfc43c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -217,6 +217,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
@@ -381,6 +384,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
@@ -526,6 +532,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
index de55609291e8a..dedc80aad7798 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
@@ -134,6 +134,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -194,6 +197,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
@@ -248,6 +254,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index dc6677ad82f74..ba0e6d324c8ef 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -344,6 +344,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
@@ -531,6 +534,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
@@ -769,6 +775,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 3bd4eb738de48..28c4631d6dcc3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,6 +184,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
@@ -239,6 +242,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
@@ -305,6 +311,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
index d0ad2139dc46a..ccd270c2f0266 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
@@ -341,6 +341,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -566,6 +569,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
@@ -745,6 +751,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
index fe630c28ae88b..d528f4a39d6df 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
@@ -220,6 +220,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -280,6 +283,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -330,6 +336,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
index b557665903aed..e7e02a548cf3f 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -379,6 +379,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
@@ -627,6 +630,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
@@ -824,6 +830,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
index 15ee165cf3ae6..da22508d376c2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
@@ -243,6 +243,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -307,6 +310,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
@@ -360,6 +366,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index 7be4dcef0b819..f0f30f8167eab 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -195,6 +195,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -210,6 +213,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -341,6 +347,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
@@ -473,6 +482,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -486,6 +498,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:26 AM] File change detected. Starting incremental compilation...
@@ -601,6 +616,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index 1a6d958de3fcf..cba2b04fd9a1e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -103,6 +103,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -118,6 +121,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -171,6 +177,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
@@ -207,6 +216,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -220,6 +232,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
@@ -257,6 +272,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index a86a7a77ebcd1..647931ee0b911 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -200,6 +200,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
@@ -345,6 +348,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
@@ -473,6 +479,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 20bd86dbbcc2a..b932bc8b5fa28 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -113,6 +113,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
@@ -159,6 +162,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
@@ -200,6 +206,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
index 04fd2718e99ba..6dd4e54ae0f2e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -246,6 +246,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -420,6 +423,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
@@ -577,6 +583,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:38 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 93a218d5dc87d..bb32846757586 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,6 +151,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
@@ -218,6 +221,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
@@ -280,6 +286,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:22 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index 15661c2ee655b..4a9384d75a756 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -394,6 +394,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -593,6 +596,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
@@ -853,6 +859,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 392bcdf6ae4c6..57c8bf9add06e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,6 +214,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -278,6 +281,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -358,6 +364,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
index 97392bcf94216..68d7d883f9de7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -396,6 +396,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:10 AM] File change detected. Starting incremental compilation...
@@ -631,6 +634,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:45 AM] File change detected. Starting incremental compilation...
@@ -837,6 +843,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:20 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
index 7e41bcf7068c7..3484ec70925d8 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
@@ -251,6 +251,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -318,6 +321,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:35 AM] File change detected. Starting incremental compilation...
@@ -379,6 +385,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:04 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index d56cb82af4ad5..e5f41e633aace 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -447,6 +447,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
@@ -705,6 +708,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:54 AM] File change detected. Starting incremental compilation...
@@ -934,6 +940,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:32 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
index 6bb22b90f3e6d..31d9c5fa41ead 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
@@ -283,6 +283,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
@@ -354,6 +357,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
@@ -419,6 +425,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:16 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index 267d58c58554a..fc3383eae7e39 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -196,6 +196,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -211,6 +214,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -365,6 +371,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -506,6 +515,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -519,6 +531,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
@@ -644,6 +659,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index 3ec2a05fc862d..d12d4ee0446bc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -103,6 +103,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -118,6 +121,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -185,6 +191,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -221,6 +230,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -234,6 +246,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
@@ -272,6 +287,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index a222b06540aa0..0c55e4162a8f6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -192,6 +192,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -332,6 +335,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
@@ -455,6 +461,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 1b0c1d3b42ffe..d59eba8b4b49c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -109,6 +109,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
@@ -154,6 +157,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
@@ -194,6 +200,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js
index 10fc26171315b..8206fdc3327c2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -217,6 +217,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
@@ -374,6 +377,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -514,6 +520,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index cc6d4221e0b99..76ad70f1fc1e6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -134,6 +134,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -192,6 +195,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
@@ -245,6 +251,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index a97257834725a..a332a2d2b9d54 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -344,6 +344,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
@@ -514,6 +517,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
@@ -745,6 +751,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 1afd8a0f91172..6f9fbb85610da 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,6 +184,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
@@ -235,6 +238,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
@@ -302,6 +308,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
index 9996619723754..db9b3d65c5efe 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
@@ -341,6 +341,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -544,6 +547,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
@@ -718,6 +724,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
index 554465f49aa14..8ff68e0a8acca 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
@@ -220,6 +220,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -275,6 +278,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
@@ -324,6 +330,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:10 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
index 93db61231ca03..b25fff15e4c52 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -379,6 +379,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
@@ -600,6 +603,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
@@ -792,6 +798,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
index 6ad6a7deda837..36a137faf01ed 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
@@ -243,6 +243,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -301,6 +304,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -353,6 +359,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index 47e8587aab3c0..07fd08b3ecff2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -195,6 +195,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -210,6 +213,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -341,6 +347,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
@@ -473,6 +482,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -486,6 +498,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:26 AM] File change detected. Starting incremental compilation...
@@ -601,6 +616,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index a6b573ca15b23..0e0967a2bd702 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -103,6 +103,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -118,6 +121,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -171,6 +177,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
@@ -207,6 +216,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -220,6 +232,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
@@ -257,6 +272,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
index 26e8cfd24eaf2..735f0b4ef8a16 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change-with-incremental.js
@@ -200,6 +200,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
@@ -345,6 +348,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
@@ -473,6 +479,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 94650db4305d2..c075cc712fb30 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -113,6 +113,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
@@ -159,6 +162,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
@@ -200,6 +206,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
index 6fadabc945c56..521abd6087112 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change-with-incremental.js
@@ -246,6 +246,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -419,6 +422,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
@@ -575,6 +581,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index 5da1ac3b3d04e..a20cbd6e6ea8c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,6 +151,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
@@ -217,6 +220,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
@@ -278,6 +284,9 @@ export class C
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
index 21521a773afc1..962cd50d3ec25 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes-with-incremental.js
@@ -394,6 +394,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
@@ -595,6 +598,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
@@ -857,6 +863,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 96e681196b470..ccc30c64a06db 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,6 +214,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
@@ -280,6 +283,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -362,6 +368,9 @@ export interface Coords {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
index dda09f4b82820..f520b4916c41a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -396,6 +396,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:10 AM] File change detected. Starting incremental compilation...
@@ -630,6 +633,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:42 AM] File change detected. Starting incremental compilation...
@@ -835,6 +841,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:14 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
index 3b06ab55a0acf..d24a17f38d23a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
@@ -251,6 +251,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -317,6 +320,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
@@ -377,6 +383,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:58 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index 6d29e9c96bdf1..3a9a80cbd3d0f 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -447,6 +447,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
@@ -704,6 +707,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
@@ -932,6 +938,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
index b29d754d644e2..5be36eadd0310 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
@@ -283,6 +283,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
@@ -353,6 +356,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:41 AM] File change detected. Starting incremental compilation...
@@ -417,6 +423,9 @@ export interface ITest {
 }
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:10 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index d58785414d027..03e4d6b77fdfc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -196,6 +196,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -211,6 +214,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -365,6 +371,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
@@ -506,6 +515,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -519,6 +531,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
@@ -644,6 +659,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index ac5a6d2cf9035..1326d84f3b9c7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -103,6 +103,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -118,6 +121,9 @@ const a = {
 };
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -185,6 +191,9 @@ import { A } from "../shared/types/db";
 const a: string = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
@@ -221,6 +230,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -234,6 +246,9 @@ import { A } from "../shared/types/db";
 const a: string = "hello";
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
@@ -272,6 +287,9 @@ Change:: No change
 Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
index 6ac934f1aa2f1..c9445256b42a1 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
@@ -115,6 +115,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
index c6e09794669f0..745dcc7a2ba36 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
@@ -115,6 +115,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 849ea7fb6def1..4475feece07af 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -143,6 +143,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
index 2b500f8b7cfc5..03075f5224822 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
@@ -131,6 +131,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index 6fc12a4b547e2..e19e2cc04254e 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -97,6 +97,9 @@ Input::
 import { logger } from "./Logger"; new logger();
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index 7ece7f294c376..994b3a81a026a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -143,6 +143,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
index 7b365684a6402..c3cf00e6d15cf 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
@@ -131,6 +131,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index 39d6aaccc373d..b3bd8035af2ba 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -149,6 +149,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
index 539e1de0c7939..72faae3ae5542 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
@@ -139,6 +139,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index a9c4c67a777ba..4409a4d183118 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -151,6 +151,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
index 8d0757e5cf2fc..ff60f75c481a9 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
@@ -139,6 +139,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index 8c673d1c7ef22..a3dccc85858fd 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -151,6 +151,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
index ab140408b76f8..7ca20b08238a3 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
@@ -139,6 +139,9 @@ export const b = 2;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
index 4d883510155ef..c862f87e42015 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
@@ -142,6 +142,9 @@ Input::
                     import a = require("./ModuleC")
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
index d26a91b78170a..50e1394f779f8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
@@ -95,6 +95,9 @@ Change:: Change name of file from logger to Logger
 Input::
 //// [/user/username/projects/myproject/Logger.ts] file was renamed from file /user/username/projects/myproject/logger.ts
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js b/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
index 4b15b9963fb36..ccacdcea4a089 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/diagnostics-from-cache.js
@@ -130,6 +130,9 @@ import * as me from "./index.js";export function thing(): void {}
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js b/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js
index 9721bb1c60fec..d9f5296a75123 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/module-resolutions-from-file-are-partially-used.js
@@ -213,6 +213,9 @@ export const x = 10;
 import type { ImportInterface } from "pkg" assert { "resolution-mode": "import" }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
index d67b2e33d8da9..6de57e238279b 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
@@ -135,6 +135,13 @@ Input::
 {"name":"app","version":"1.0.0"}
 
 
+Before running Timeout callback:: count: 1
+1: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+2: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -243,6 +250,13 @@ Input::
 {"name":"app","version":"1.0.0","type":"module"}
 
 
+Before running Timeout callback:: count: 1
+3: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+4: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -344,6 +358,13 @@ Change:: Delete package.json
 Input::
 //// [/user/username/projects/myproject/package.json] deleted
 
+Before running Timeout callback:: count: 1
+5: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+6: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -463,6 +484,13 @@ Input::
 {"name":"app","version":"1.0.0"}
 
 
+Before running Timeout callback:: count: 1
+7: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+8: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+8: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 0:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -549,6 +577,13 @@ Change:: Delete package.json
 Input::
 //// [/user/username/projects/myproject/package.json] deleted
 
+Before running Timeout callback:: count: 1
+9: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+10: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+10: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js
index 174b939382f80..6a569dbd69282 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/package-json-file-is-edited.js
@@ -146,6 +146,13 @@ Input::
 {"name":"app","version":"1.0.0","type":"module"}
 
 
+Before running Timeout callback:: count: 1
+1: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+2: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -249,6 +256,13 @@ Input::
 {"name":"app","version":"1.0.0"}
 
 
+Before running Timeout callback:: count: 1
+3: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+4: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -355,6 +369,13 @@ Change:: Delete package.json
 Input::
 //// [/user/username/projects/myproject/package.json] deleted
 
+Before running Timeout callback:: count: 1
+5: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+6: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -449,6 +470,13 @@ Input::
 {"name":"app","version":"1.0.0","type":"module"}
 
 
+Before running Timeout callback:: count: 1
+7: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+8: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+8: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 0:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
@@ -553,6 +581,13 @@ Change:: Delete package.json
 Input::
 //// [/user/username/projects/myproject/package.json] deleted
 
+Before running Timeout callback:: count: 1
+9: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+10: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+10: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined File location affecting resolution
 Scheduling invalidateFailedLookup
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js b/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js
index ace1a8c7f0cb0..ecb023f38cfad 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/type-reference-resolutions-reuse.js
@@ -231,6 +231,9 @@ export const x = 10;
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:53 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
index 9b63458aa6b8a..081dae4f3edef 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
@@ -147,6 +147,13 @@ Input::
 {"name":"pkg2","version":"1.0.0","main":"build/other.js"}
 
 
+Before running Timeout callback:: count: 1
+1: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+2: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:53 AM] File change detected. Starting incremental compilation...
@@ -248,6 +255,13 @@ Input::
 {"name":"pkg2","version":"1.0.0","main":"build/index.js"}
 
 
+Before running Timeout callback:: count: 1
+3: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+4: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js
index 4fb93f6117033..92c8e562b7d42 100644
--- a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
+++ b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
@@ -89,6 +89,9 @@ import * as Thing from "thing";
 Thing.fn();
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
index 109b4bddeb909..88540896939fa 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
@@ -101,6 +101,9 @@ Input::
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
index 581fee27af8d3..0ffc3f1aacc70 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
@@ -78,6 +78,9 @@ Input::
                     }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
@@ -115,6 +118,9 @@ Input::
                     }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js
index 495ddfb5e7fc7..89a010af60060 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--allowArbitraryExtensions'-changes.js
@@ -80,6 +80,9 @@ Input::
 {"compilerOptions":{"allowArbitraryExtensions":false},"files":["/a.ts"]}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
@@ -129,6 +132,9 @@ Input::
 {"compilerOptions":{"allowArbitraryExtensions":true},"files":["/a.ts"]}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
index b741982b137da..7489756b4a0c6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
@@ -70,6 +70,9 @@ Input::
 {"compilerOptions":{"allowUnusedLabels":false}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
@@ -106,6 +109,9 @@ Input::
 {"compilerOptions":{"allowUnusedLabels":true}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
index acf66b2448d85..0a12df5d6e57a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
@@ -74,6 +74,9 @@ Input::
 let y = 1
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index e08fd42752afb..bb6c64489637b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -73,6 +73,13 @@ Input::
 export function bar() { }
 
 
+Before running Timeout callback:: count: 1
+1: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+2: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
index fc8df4b20c54a..cc4ac28e561bc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
@@ -73,6 +73,9 @@ Input::
 {"compilerOptions":{},"files":["f1.ts","f2.ts"]}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index 9efae625a029d..949c25b3b8373 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -74,6 +74,9 @@ Input::
 let y = 1
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
index fbf82f930c478..f3d2def6cf3fb 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
@@ -79,6 +79,9 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
index 4779da2c4d7d9..d4487631d29d7 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
@@ -82,6 +82,9 @@ Input::
 {"compilerOptions":{"outFile":"out.js"},"files":["f1.ts","f2.ts"]}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index bde31763034e9..b2a4fa22bc21d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -76,6 +76,9 @@ Input::
 {"compilerOptions":{"module":"none"}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js
index b107fb1536d90..3cb997ab5e4b1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js
@@ -101,6 +101,9 @@ Input::
 export * from "../c/f3"
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
index 27b3fe0dcd3ac..e6c85fa3d66e3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
@@ -84,6 +84,10 @@ Change:: Delete config file
 Input::
 //// [/a/b/tsconfig.json] deleted
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 1
+1: timerToUpdateProgram
 Output::
 error TS5083: Cannot read file '/a/b/tsconfig.json'.
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
index afe5f2fa334c1..a3fa7f03aa7f7 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -83,6 +83,9 @@ Input::
 {"compilerOptions":{"module":"commonjs","target":"es5","noImplicitAny":true,"sourceMap":false,"lib":["es5","es2015.promise"]}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
index 1cc5753858c38..8273111941f55 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
@@ -176,6 +176,9 @@ Input::
 export const z = 1;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
@@ -331,6 +334,9 @@ Input::
 import { z } from "./new-file";export const x = 1
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/f1.ts 1:: WatchInfo: /user/username/projects/myproject/f1.ts 250 undefined Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
index 989c70e0bb14e..3555ddd6906a6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
@@ -118,6 +118,9 @@ Change:: Delete f2
 Input::
 //// [/a/b/f2.ts] deleted
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
index b18b7d747c94b..437780e3ff44f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
@@ -118,6 +118,9 @@ Change:: Delete f2
 Input::
 //// [/a/b/f2.ts] deleted
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
index 2c1e638c62502..42e341258e2b3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
@@ -88,6 +88,9 @@ Input::
 {"extends":"./second.tsconfig.json","compilerOptions":{},"files":["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
@@ -149,6 +152,9 @@ Input::
 {"compilerOptions":{"strict":false}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -190,6 +196,9 @@ Input::
 {"extends":"./first.tsconfig.json","compilerOptions":{"strictNullChecks":true}}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
@@ -223,6 +232,9 @@ Input::
 {"compilerOptions":{},"files":["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]}
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
index 494f0ee7aab5f..23971384b4b6c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
@@ -80,6 +80,9 @@ Change:: Delete f2
 Input::
 //// [/a/b/f2.ts] deleted
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
index 32a2e0f914a45..be91d6912fff9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
@@ -92,6 +92,9 @@ Input::
 let y = 1;let xy = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
@@ -137,6 +140,9 @@ Change:: delete file2
 Input::
 //// [/a/b/commonFile2.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
@@ -193,6 +199,9 @@ Input::
 let y = 1
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js b/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js
index 2cfd36d496dd2..99972004426ca 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handles-the-missing-files---that-were-added-to-program-because-they-were-added-with-tripleSlashRefs.js
@@ -87,6 +87,9 @@ FsWatches::
 /a/lib/lib.d.ts:
   {}
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index 72bb3a5531680..425846d6d5f25 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -96,6 +96,11 @@ export function bar() { };
 //// [/a/b/moduleFile.ts] deleted
 //// [/a/b/moduleFile.js] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
+Before running Timeout callback:: count: 0
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
@@ -172,6 +177,14 @@ export function bar() { };
 
 //// [/a/b/moduleFile1.ts] deleted
 
+Before running Timeout callback:: count: 2
+7: timerToInvalidateFailedLookupResolutions
+8: timerToUpdateProgram
+After running Timeout callback:: count: 1
+9: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+9: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index f95daa8bcdfe4..b78742ed3331f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -83,6 +83,11 @@ export function bar() { };
 //// [/a/b/moduleFile.ts] deleted
 //// [/a/b/moduleFile.js] deleted
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
+Before running Timeout callback:: count: 0
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
@@ -135,6 +140,13 @@ export function bar() { };
 
 //// [/a/b/moduleFile1.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+4: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
index 465a90ba23998..0fa519fa949f5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
@@ -97,6 +97,9 @@ Input::
 import { x } from "../b";
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
index 30a3ac9980857..0d6f7f137bf0a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
@@ -93,6 +93,9 @@ Input::
 export const a: number = 1
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
index de6639f345a64..83f533b72decc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
@@ -103,6 +103,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -115,6 +117,10 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 2
+1: timerToInvalidateFailedLookupResolutions
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
@@ -180,6 +186,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
index 7e3581ba696db..968d6c33cc004 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
@@ -103,6 +103,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -115,6 +117,10 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 2
+1: timerToInvalidateFailedLookupResolutions
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
@@ -180,6 +186,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
index b6c7126cb5170..a46ec1f4ae58d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
@@ -95,6 +95,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -107,6 +109,10 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 2
+1: timerToInvalidateFailedLookupResolutions
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -168,6 +174,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 3a8fd0d55ebf5..ebaa1377226b9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -86,6 +86,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -98,6 +100,10 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 2
+1: timerToInvalidateFailedLookupResolutions
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
@@ -169,6 +175,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
index fc4b414e6b3a4..0581bd545dca5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
@@ -103,6 +103,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -115,6 +117,10 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 2
+1: timerToInvalidateFailedLookupResolutions
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
@@ -180,6 +186,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
index d40f2e66d9eb9..087137748776d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
@@ -95,6 +95,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -107,6 +109,10 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 2
+1: timerToInvalidateFailedLookupResolutions
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
@@ -168,6 +174,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index ce120d401de5d..af67451bf4e35 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -96,6 +96,9 @@ Input::
                     }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
index f42e3bf3247d1..abce157dc06b4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
@@ -91,6 +91,9 @@ Input::
 let y = 1;let xy = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
@@ -141,6 +144,9 @@ Input::
                     }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js b/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js
index a0bca6e541384..5ee17fc6d2be3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/shouldnt-report-error-about-unused-function-incorrectly-when-file-changes-from-global-to-module.js
@@ -76,6 +76,9 @@ export function two() {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js b/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js
index 080a93cf34900..30ab869c57582 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js
@@ -143,5 +143,7 @@ __exportStar(require("../d/f3"), exports);
 
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 First program is not updated:: true
 Second program is not updated:: true
\ No newline at end of file
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index 483634beeacf6..6f84adda15062 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -144,6 +144,9 @@ Input::
 {"compilerOptions":{"target":"es6","importsNotUsedAsValues":"error","experimentalDecorators":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
@@ -198,6 +201,9 @@ Input::
 {"compilerOptions":{"target":"es6","importsNotUsedAsValues":"error","experimentalDecorators":true,"emitDecoratorMetadata":true}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
index ccb22c3258d2e..7fd9ea74d2254 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
@@ -84,6 +84,9 @@ Input::
 {"compilerOptions":{"target":"es6","useDefineForClassFields":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
index 12aa922ea88c5..7e81022fc60d5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
@@ -75,6 +75,9 @@ Input::
 { "compilerOptions": { "jsx": "react" } }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
index 22cd5ff3cf8b3..2c22df18b8809 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
@@ -99,6 +99,9 @@ Input::
 {"compilerOptions":{"importsNotUsedAsValues":"remove"}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
@@ -134,6 +137,9 @@ Input::
 {"compilerOptions":{"importsNotUsedAsValues":"error"}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
@@ -180,6 +186,9 @@ Input::
 {"compilerOptions":{"importsNotUsedAsValues":"preserve"}}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
index 16830bb296037..92fd48145be6d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
@@ -85,6 +85,9 @@ function test(x: string, y: number) {
 export default test;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
@@ -127,6 +130,9 @@ function test(x: number, y: number) {
 export default test;
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
@@ -164,6 +170,9 @@ function test(x: number, y: string) {
 export default test;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
@@ -211,6 +220,9 @@ function test(x: number, y: number) {
 export default test;
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
index 124039bf77c41..a4da804a81f2d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
@@ -89,6 +89,9 @@ var y: number;
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
@@ -128,6 +131,9 @@ var y: number;
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
index 0d944293ec241..0c73047466268 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
@@ -84,6 +84,9 @@ var y: number;
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
@@ -122,6 +125,9 @@ var y: number;
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
index c2fdb954089bc..035ba1e07887b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
@@ -84,6 +84,9 @@ var y: number;
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
@@ -122,6 +125,9 @@ var y: number;
 }
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
index cfe0c2a23645f..2799c50cebd9d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
@@ -82,6 +82,9 @@ var x: string;
 var y: number;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
@@ -122,6 +125,9 @@ interface Document {
 var y: number;
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
index 416c76a4afd5f..c08c0a67639dd 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
@@ -77,6 +77,9 @@ var x: string;
 var y: number;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
@@ -116,6 +119,9 @@ interface Document {
 var y: number;
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
index 1af3ca7c089fe..742af2a6bd15d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
@@ -77,6 +77,9 @@ var x: string;
 var y: number;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
@@ -116,6 +119,9 @@ interface Document {
 var y: number;
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
index 0dffbccc542f4..976c794e628a4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
@@ -77,6 +77,9 @@ declare module 'a' {
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
@@ -153,6 +156,9 @@ Change:: Delete b.ts
 Input::
 //// [/user/username/projects/myproject/b.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
index 23cfbd2d272a5..40ad73bce4767 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
@@ -91,6 +91,9 @@ Input::
 {"compilerOptions":{"forceConsistentCasingInFileNames":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
index b59fdbcaee50d..fded053638b00 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
@@ -88,6 +88,9 @@ Input::
 {"compilerOptions":{"noErrorTruncation":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
index d2a4cd31f8024..e028c699889ee 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
@@ -75,6 +75,9 @@ Input::
 {"compilerOptions":{"strictNullChecks":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
@@ -111,6 +114,9 @@ Input::
 {"compilerOptions":{"strict":true,"alwaysStrict":false}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
@@ -147,6 +153,9 @@ Input::
 {"compilerOptions":{}}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index 6446eee798f23..304784e3d6943 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -87,6 +87,9 @@ Input::
 {"compilerOptions":{"moduleResolution":"node","resolveJsonModule":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
index d24fba3e161f3..bae18cf66c908 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
@@ -75,6 +75,9 @@ var a = 10;
 
 //// [/home/username/project/src/file1.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js
index aa1b3d5482e04..64d3012305e51 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-changing-`allowImportingTsExtensions`-of-config-file.js
@@ -95,6 +95,9 @@ Input::
 {"compilerOptions":{"noEmit":true,"allowImportingTsExtensions":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Config file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
index e82c3894c9d9d..29076ddcb1bf1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
@@ -84,6 +84,9 @@ Input::
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
index 9b6ea25e6fb28..629cbc2a1a749 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
@@ -112,6 +112,9 @@ Input::
 import * as M from "folder1/module1";
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index 22dfe1960de9b..b082c04249659 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -188,6 +188,9 @@ Input::
 class class3 {}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
@@ -294,6 +297,9 @@ FsWatchesRecursive::
 /user/username/projects/myproject/projects/project2:
   {}
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
@@ -446,6 +452,8 @@ Input::
 declare class file {}
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
@@ -463,6 +471,9 @@ Change:: Delete output of class3
 Input::
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
@@ -641,6 +652,9 @@ FsWatchesRecursive::
 /user/username/projects/myproject/projects/project2:
   {}
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
index 13ada7230d2f7..28c3e5b0f6711 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
@@ -103,6 +103,9 @@ Input::
 {"compilerOptions":{"skipLibCheck":true}}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
@@ -140,6 +143,9 @@ Input::
 {"compilerOptions":{"skipDefaultLibCheck":true}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
@@ -182,6 +188,9 @@ Input::
 {"compilerOptions":{}}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
@@ -228,6 +237,9 @@ Input::
 {"compilerOptions":{"skipDefaultLibCheck":true}}
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
@@ -269,6 +281,9 @@ Input::
 {"compilerOptions":{"skipLibCheck":true}}
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:51 AM] File change detected. Starting incremental compilation...
@@ -306,6 +321,9 @@ Input::
 {"compilerOptions":{}}
 
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:56 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
index be633a1719bb3..dd547d9aac306 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
@@ -83,6 +83,9 @@ Change:: Modify config without changing content
 Input::
 //// [/a/b/tsconfig.json] file changed its modified time
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index e42431a6ac033..811563e24dc58 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -643,6 +643,8 @@ function foo() { }
 }
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -770,6 +772,9 @@ export declare function gfoo(): void;
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
@@ -1043,6 +1048,9 @@ export declare function gfoo(): void;
 
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:20 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index 1e3f8faaeb2b9..4d8f498950293 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -421,6 +421,9 @@ export declare function gfoo(): void;
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
@@ -496,6 +499,9 @@ export class A {}
 
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
@@ -641,6 +647,9 @@ Input::
 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"references":[{"path":"../b"}]}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
@@ -786,6 +795,9 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../nrefs/*"]}},"references":[{"path":"../a"}]}
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:47 AM] File change detected. Starting incremental compilation...
@@ -901,6 +913,9 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"references":[{"path":"../a"}]}
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
@@ -1006,6 +1021,10 @@ Change:: deleting referenced config file
 Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
+Before running Timeout callback:: count: 2
+6: timerToUpdateProgram
+7: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
@@ -1126,6 +1145,10 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"references":[{"path":"../a"}]}
 
 
+Before running Timeout callback:: count: 2
+8: timerToUpdateProgram
+9: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:06 AM] File change detected. Starting incremental compilation...
@@ -1241,6 +1264,10 @@ Change:: deleting transitively referenced config file
 Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
+Before running Timeout callback:: count: 2
+10: timerToUpdateProgram
+11: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:12 AM] File change detected. Starting incremental compilation...
@@ -1357,6 +1384,10 @@ Input::
 {"compilerOptions":{"composite":true}}
 
 
+Before running Timeout callback:: count: 2
+12: timerToUpdateProgram
+13: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:20 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index b5a0fee1fe80a..ac3ae1bed40dc 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -419,6 +419,9 @@ export declare function gfoo(): void;
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
@@ -494,6 +497,9 @@ export class A {}
 
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
@@ -641,6 +647,9 @@ Input::
 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"files":["index.ts"],"references":[{"path":"../b"}]}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
@@ -788,6 +797,9 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../nrefs/*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:47 AM] File change detected. Starting incremental compilation...
@@ -903,6 +915,9 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
@@ -1004,6 +1019,10 @@ Change:: deleting referenced config file
 Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
+Before running Timeout callback:: count: 2
+6: timerToUpdateProgram
+7: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
@@ -1118,6 +1137,10 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
 
 
+Before running Timeout callback:: count: 2
+8: timerToUpdateProgram
+9: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:06 AM] File change detected. Starting incremental compilation...
@@ -1231,6 +1254,10 @@ Change:: deleting transitively referenced config file
 Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
+Before running Timeout callback:: count: 2
+10: timerToUpdateProgram
+11: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:12 AM] File change detected. Starting incremental compilation...
@@ -1345,6 +1372,10 @@ Input::
 {"compilerOptions":{"composite":true},"files":["index.ts"]}
 
 
+Before running Timeout callback:: count: 2
+12: timerToUpdateProgram
+13: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:20 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
index bb731a5678c53..2148006826a25 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
@@ -432,6 +432,9 @@ export declare function gfoo(): void;
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
@@ -507,6 +510,9 @@ export class A {}
 
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
@@ -634,6 +640,9 @@ Input::
 {"files":["c.ts"],"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["./refs/*"]}},"references":[{"path":"tsconfig.b.json"}]}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:33 AM] File change detected. Starting incremental compilation...
@@ -761,6 +770,9 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["./nrefs/*"]}},"files":["b.ts"],"references":[{"path":"tsconfig.a.json"}]}
 
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:41 AM] File change detected. Starting incremental compilation...
@@ -866,6 +878,9 @@ Input::
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["./refs/*"]}},"files":["b.ts"],"references":[{"path":"tsconfig.a.json"}]}
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:47 AM] File change detected. Starting incremental compilation...
@@ -961,6 +976,9 @@ Change:: deleting referenced config file
 Input::
 //// [/user/username/projects/transitiveReferences/tsconfig.b.json] deleted
 
+Before running Timeout callback:: count: 1
+6: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
@@ -1080,6 +1098,9 @@ Input::
 
 
 
+Before running Timeout callback:: count: 1
+7: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:00 AM] File change detected. Starting incremental compilation...
@@ -1185,6 +1206,9 @@ Change:: deleting transitively referenced config file
 Input::
 //// [/user/username/projects/transitiveReferences/tsconfig.a.json] deleted
 
+Before running Timeout callback:: count: 1
+8: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:06 AM] File change detected. Starting incremental compilation...
@@ -1292,6 +1316,9 @@ Input::
 
 
 
+Before running Timeout callback:: count: 1
+9: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:02:14 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
index 2345749f37e90..56fc5473e2a21 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-declarationMap-changes-for-dependency.js
@@ -481,6 +481,9 @@ export declare function multiply(a: number, b: number): number;
 }
 
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:01:18 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index f206100e77666..a5c0bee758229 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -91,6 +91,9 @@ import {x} from "f1"
                             var x: string = 1;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
@@ -146,6 +149,9 @@ Input::
 import {x} from "f2"
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
@@ -209,6 +215,9 @@ Input::
 import {x} from "f1"
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
index e6515353ff965..0e674d7275f16 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
@@ -85,6 +85,8 @@ Input::
 {"something":10}
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
index 0ae1f8d82a0ec..be971c3703b01 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
@@ -77,6 +77,8 @@ Input::
 {"something":10}
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index 34cb2ec5dbeb6..7e37636e7ac7b 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -82,6 +82,10 @@ import {y} from "bar"
 export const y = 1;
 
 
+Before running Timeout callback:: count: 2
+1: timerToUpdateProgram
+2: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js b/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js
index d14ac7e1d55c0..7f8f698e2bfb3 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/reusing-type-ref-resolution.js
@@ -333,6 +333,14 @@ Input::
 export interface Import1 {}
 
 
+Before running Timeout callback:: count: 2
+3: timerToInvalidateFailedLookupResolutions
+4: timerToUpdateProgram
+After running Timeout callback:: count: 1
+5: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+5: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /src/project/node_modules/pkg1 :: WatchInfo: /src/project/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup
@@ -569,6 +577,14 @@ Input::
 export interface Import3 {}
 
 
+Before running Timeout callback:: count: 2
+8: timerToInvalidateFailedLookupResolutions
+9: timerToUpdateProgram
+After running Timeout callback:: count: 1
+10: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+10: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /src/project/node_modules/pkg3 :: WatchInfo: /src/project/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index 663d7d8032541..a663c38f11dfe 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -74,6 +74,10 @@ Change:: Delete imported file
 Input::
 //// [/a/bar.d.ts] deleted
 
+Before running Timeout callback:: count: 2
+1: timerToUpdateProgram
+2: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:18 AM] File change detected. Starting incremental compilation...
@@ -131,6 +135,13 @@ Input::
 export const y = 1;export const x = 10;
 
 
+Before running Timeout callback:: count: 1
+3: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+4: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index b8a06230e3fde..c0745be488855 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -105,6 +105,14 @@ FsWatchesRecursive::
 /user/username/projects/myproject/node_modules: *new*
   {}
 
+Before running Timeout callback:: count: 2
+9: timerToInvalidateFailedLookupResolutions
+10: timerToUpdateProgram
+After running Timeout callback:: count: 1
+11: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+11: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
 
@@ -158,6 +166,8 @@ Change:: No change, just check program
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
index d5014956ba52a..67a0a702e9644 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
@@ -102,6 +102,9 @@ declare module "fs" {
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
index 7be1ce78beb9c..1e83fab2a963e 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
@@ -130,6 +130,10 @@ Input::
 //// [/user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts] deleted
 //// [/user/username/projects/myproject/node_modules/@types/node/globals.d.ts] deleted
 
+Before running Timeout callback:: count: 2
+28: timerToInvalidateFailedLookupResolutions
+29: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 Scheduling update
@@ -282,6 +286,10 @@ Input::
 export const foo = 10;
 
 
+Before running Timeout callback:: count: 2
+40: timerToInvalidateFailedLookupResolutions
+41: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
@@ -369,6 +377,10 @@ Change:: npm ci step three: create atTypes node folder
 
 Input::
 
+Before running Timeout callback:: count: 2
+44: timerToInvalidateFailedLookupResolutions
+45: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
@@ -432,6 +444,14 @@ declare namespace NodeJS {
 }
 
 
+Before running Timeout callback:: count: 2
+48: timerToInvalidateFailedLookupResolutions
+50: timerToUpdateProgram
+After running Timeout callback:: count: 1
+51: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+51: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index 8bded887c6b9e..19f70777a378e 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -103,6 +103,10 @@ FsWatchesRecursive::
 /a/b/node_modules/@types: *new*
   {}
 
+Before running Timeout callback:: count: 2
+14: timerToUpdateProgram
+16: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
 sysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index 576183fae11f4..3df5b344e2b0c 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -95,6 +95,10 @@ FsWatchesRecursive::
 /user/username/projects/myproject/node_modules/@types: *new*
   {}
 
+Before running Timeout callback:: count: 2
+11: timerToUpdateProgram
+13: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
 sysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index a91b6874e352b..3f2db4420c9a3 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -110,6 +110,9 @@ module1("hello");
 ;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js b/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
index 56129a55655ba..ad2529179dac7 100644
--- a/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
+++ b/tests/baselines/reference/tscWatch/resolveJsonModule/incremental-always-prefers-declaration-file-over-document.js
@@ -165,6 +165,9 @@ Input::
 }
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
index dc4a78c506537..737743af47906 100644
--- a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
+++ b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
@@ -85,6 +85,9 @@ Input::
 
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js b/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js
index 1d76db8be0a50..cfdb3de3d54e5 100644
--- a/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js
+++ b/tests/baselines/reference/tscWatch/watchApi/host-implements-does-not-implement-hasInvalidatedResolutions.js
@@ -95,6 +95,9 @@ Change:: write other with same contents
 Input::
 //// [/user/username/projects/myproject/other.d.ts] file changed its modified time
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/other.d.ts 1:: WatchInfo: /user/username/projects/myproject/other.d.ts 250 undefined Source file
 Scheduling update
@@ -138,6 +141,9 @@ Input::
 export function foo(): void;export function bar(): void;
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/other.d.ts 1:: WatchInfo: /user/username/projects/myproject/other.d.ts 250 undefined Source file
 Scheduling update
@@ -187,6 +193,9 @@ Input::
 export function foo() {}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/other.d.ts 1:: WatchInfo: /user/username/projects/myproject/other.d.ts 250 undefined Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js b/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js
index 1ef24d50d1fce..80142af37d4cb 100644
--- a/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js
+++ b/tests/baselines/reference/tscWatch/watchApi/host-implements-hasInvalidatedResolutions.js
@@ -95,6 +95,9 @@ Change:: write other with same contents
 Input::
 //// [/user/username/projects/myproject/other.d.ts] file changed its modified time
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/other.d.ts 1:: WatchInfo: /user/username/projects/myproject/other.d.ts 250 undefined Source file
 Scheduling update
@@ -112,6 +115,9 @@ Input::
 export function foo(): void;export function bar(): void;
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/other.d.ts 1:: WatchInfo: /user/username/projects/myproject/other.d.ts 250 undefined Source file
 Scheduling update
@@ -154,6 +160,9 @@ Input::
 export function foo() {}
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/other.d.ts 1:: WatchInfo: /user/username/projects/myproject/other.d.ts 250 undefined Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index 733a32d59d6b0..6311ed774c6d8 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -79,6 +79,9 @@ export const x = 10;
 // SomeComment
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js
index 26f5db0fb0347..597ea52ed4bd5 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles-with-outFile.js
@@ -83,6 +83,9 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/b.ts 1:: WatchInfo: /user/username/projects/myproject/b.ts 250 undefined Source file
 Scheduling update
@@ -200,6 +203,8 @@ Change:: Emit with emitOnlyDts shouldnt emit anything
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
@@ -326,6 +331,8 @@ define("b", ["require", "exports"], function (require, exports) {
 
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
@@ -339,6 +346,8 @@ Change:: Emit with emitOnlyDts shouldnt emit anything
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
@@ -352,6 +361,8 @@ Change:: Emit full should not emit anything
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js
index 10810abe299a3..95b61867079df 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-emitting-with-emitOnlyDtsFiles.js
@@ -172,6 +172,9 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/b.ts 1:: WatchInfo: /user/username/projects/myproject/b.ts 250 undefined Source file
 Scheduling update
@@ -293,6 +296,8 @@ Change:: Emit with emitOnlyDts shouldnt emit anything
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
@@ -390,6 +395,8 @@ define(["require", "exports"], function (require, exports) {
 
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
@@ -403,6 +410,8 @@ Change:: Emit with emitOnlyDts shouldnt emit anything
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
@@ -416,6 +425,8 @@ Change:: Emit full should not emit anything
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 Program: Same as old program
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index 835d57983eee8..fed353802fdce 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -188,6 +188,9 @@ Input::
 class class3 {}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
@@ -294,6 +297,9 @@ FsWatchesRecursive::
 /user/username/projects/myproject/projects/project2:
   {}
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
@@ -446,6 +452,8 @@ Input::
 declare class file {}
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
@@ -463,6 +471,9 @@ Change:: Delete output of class3
 Input::
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
@@ -641,6 +652,9 @@ FsWatchesRecursive::
 /user/username/projects/myproject/projects/project2:
   {}
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index 7b62578d6706c..9a3af92119c60 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -188,6 +188,9 @@ Input::
 class class3 {}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
@@ -339,6 +342,8 @@ Input::
 declare class file {}
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
@@ -358,6 +363,8 @@ Input::
 declare class class3 {}
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js
index 3cfee3b591ae1..4dcaf6eb0a03c 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-when-there-is-no-config-file-name.js
@@ -108,6 +108,9 @@ Input::
 {"compilerOptions":{"composite":true},"files":["index.ts"]}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js
index 31c1f52e0df73..8c915b49b58d0 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-watching-referenced-project-with-extends-when-there-is-no-config-file-name.js
@@ -111,6 +111,9 @@ Input::
 {"extends":"./tsconfig.base.json","compilerOptions":{"typeRoots":[]},"files":["index.ts"]}
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.json 2000 undefined Config file of referened project
 Scheduling update
@@ -149,6 +152,9 @@ Input::
 {"compilerOptions":{"composite":true}}
 
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/project/lib/tsconfig.base.json 1:: WatchInfo: /user/username/projects/project/lib/tsconfig.base.json 2000 undefined Extended config file of referenced project
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
index 8308688502d97..0a12d3cacf0c9 100644
--- a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
+++ b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
@@ -74,6 +74,8 @@ Input::
 const y =10;
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js
index 893770caca2a0..45c88b47749ad 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js
@@ -73,6 +73,9 @@ Input::
 let a: string = "Hello World"
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with main.ts 1:: WatchInfo: main.ts 250 undefined Source file
 Scheduling update
@@ -112,6 +115,9 @@ Change:: receive another change event without modifying the file
 
 Input::
 
+Before running Timeout callback:: count: 1
+2: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with main.ts 1:: WatchInfo: main.ts 250 undefined Source file
 Scheduling update
@@ -129,6 +135,9 @@ Input::
 
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with main.ts 1:: WatchInfo: main.ts 250 undefined Source file
 Scheduling update
@@ -166,6 +175,9 @@ Change:: receive another change event without modifying the file
 
 Input::
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with main.ts 1:: WatchInfo: main.ts 250 undefined Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
index 9b1eb33000397..2b00e8eeaee92 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
@@ -117,6 +117,10 @@ FsWatches *deleted*::
 /user/username/projects/myproject/foo.d.ts:
   {"inode":9}
 
+Before running Timeout callback:: count: 2
+6: timerToUpdateProgram
+7: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
@@ -213,6 +217,10 @@ FsWatches *deleted*::
 /user/username/projects/myproject/foo.d.ts:
   {"inode":12}
 
+Before running Timeout callback:: count: 2
+13: timerToUpdateProgram
+14: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
index ae28ab5717230..14f409f09a74d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -114,6 +114,9 @@ FsWatches *deleted*::
 /user/username/projects/myproject/foo.ts:
   {"inode":9}
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
@@ -185,6 +188,9 @@ FsWatches *deleted*::
 /user/username/projects/myproject/foo.ts:
   {"inode":13}
 
+Before running Timeout callback:: count: 1
+4: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
index e7f3b37e9dea9..62d1b6f63527f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -117,6 +117,10 @@ FsWatches *deleted*::
 /user/username/projects/myproject/foo.d.ts:
   {"inode":9}
 
+Before running Timeout callback:: count: 2
+4: timerToUpdateProgram
+5: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
@@ -203,6 +207,10 @@ FsWatches *deleted*::
 /user/username/projects/myproject/foo.d.ts:
   {"inode":12}
 
+Before running Timeout callback:: count: 2
+9: timerToUpdateProgram
+10: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
index bfc76283e39e4..41ab5de35d162 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -96,6 +96,9 @@ Input::
 export declare function foo2(): string;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
@@ -148,6 +151,9 @@ Input::
 export declare function foo(): string;
 
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js
index 3714f44e191ba..44072e0cf38ad 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js
@@ -66,6 +66,21 @@ Input::
 
 //// [/a/username/project/src/file1.ts] deleted
 
+Before running Timeout callback:: count: 2
+1: pollPollingIntervalQueue
+2: timerToUpdateProgram
+After running Timeout callback:: count: 3
+3: timerToUpdateProgram
+4: pollLowPollingIntervalQueue
+5: pollPollingIntervalQueue
+Before running Timeout callback:: count: 3
+3: timerToUpdateProgram
+4: pollLowPollingIntervalQueue
+5: pollPollingIntervalQueue
+After running Timeout callback:: count: 3
+6: timerToUpdateProgram
+7: pollLowPollingIntervalQueue
+8: pollPollingIntervalQueue
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
index 8c2a2542d856d..bfe9341fe8561 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
@@ -74,6 +74,9 @@ Input::
 
 //// [/a/username/project/src/file1.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js
index 10f08f448e807..29b2ba6433063 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js
@@ -74,6 +74,10 @@ Input::
 
 //// [/a/username/project/src/file1.ts] deleted
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateProgram
+After running Timeout callback:: count: 1
+4: timerToUpdateProgram
 Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index 75e769cc80517..3d0d78bf1339c 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -89,6 +89,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -102,6 +104,12 @@ export const x = 10;
 
 //// [/user/username/projects/myproject/src/file2.ts] deleted
 
+Before running Timeout callback:: count: 2
+1: timerToUpdateProgram
+3: timerToUpdateChildWatches
+Invoking Timeout callback:: timeoutId:: 1:: timerToUpdateProgram
+After running Timeout callback:: count: 1
+3: timerToUpdateChildWatches
 Output::
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
@@ -159,6 +167,19 @@ Change:: Pending directory watchers and program update
 
 Input::
 
+Before running Timeout callback:: count: 1
+3: timerToUpdateChildWatches
+After running Timeout callback:: count: 2
+5: timerToUpdateProgram
+7: timerToInvalidateFailedLookupResolutions
+Before running Timeout callback:: count: 2
+5: timerToUpdateProgram
+7: timerToInvalidateFailedLookupResolutions
+After running Timeout callback:: count: 1
+8: timerToUpdateChildWatches
+Before running Timeout callback:: count: 1
+8: timerToUpdateChildWatches
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
index c22faf19678e4..a57e6826989bb 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
@@ -90,6 +90,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -102,6 +104,11 @@ Input::
 export const y = 10;
 
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateChildWatches
+After running Timeout callback:: count: 2
+2: timerToInvalidateFailedLookupResolutions
+3: timerToUpdateProgram
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -111,6 +118,11 @@ Change:: Actual program update to include new file
 
 Input::
 
+Before running Timeout callback:: count: 2
+2: timerToInvalidateFailedLookupResolutions
+3: timerToUpdateProgram
+After running Timeout callback:: count: 1
+5: timerToUpdateChildWatches
 Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
@@ -178,6 +190,9 @@ Change:: After program emit with new file, should schedule and run timeout to up
 
 Input::
 
+Before running Timeout callback:: count: 1
+5: timerToUpdateChildWatches
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -187,6 +202,8 @@ Change:: No change
 
 Input::
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index 8f124691aa7e1..6c6900e2daa60 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -84,6 +84,9 @@ Change:: Directory watch updates because of file1.js creation
 
 Input::
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateChildWatches
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -118,6 +121,13 @@ FsWatches *deleted*::
 /user/username/projects/myproject/node_modules/file2:
   {}
 
+Before running Timeout callback:: count: 3
+7: timerToInvalidateFailedLookupResolutions
+8: timerToUpdateProgram
+9: timerToUpdateChildWatches
+Invoking Timeout callback:: timeoutId:: 8:: timerToUpdateProgram
+After running Timeout callback:: count: 1
+9: timerToUpdateChildWatches
 Output::
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
@@ -174,6 +184,19 @@ Change:: Pending directory watchers and program update
 
 Input::
 
+Before running Timeout callback:: count: 1
+9: timerToUpdateChildWatches
+After running Timeout callback:: count: 2
+11: timerToInvalidateFailedLookupResolutions
+12: timerToUpdateProgram
+Before running Timeout callback:: count: 2
+11: timerToInvalidateFailedLookupResolutions
+12: timerToUpdateProgram
+After running Timeout callback:: count: 1
+13: timerToUpdateProgram
+Before running Timeout callback:: count: 1
+13: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
@@ -205,6 +228,9 @@ Change:: Start npm install
 
 Input::
 
+Timeout callback:: count: 1
+15: timerToUpdateChildWatches
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -214,6 +240,9 @@ Change:: npm install folder creation of file2
 
 Input::
 
+Timeout callback:: count: 1
+16: timerToUpdateChildWatches
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -226,6 +255,9 @@ Input::
 export const x = 10;
 
 
+Timeout callback:: count: 1
+16: timerToUpdateChildWatches
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -235,6 +267,11 @@ Change:: Updates the program
 
 Input::
 
+Before running Timeout callback:: count: 1
+16: timerToUpdateChildWatches
+After running Timeout callback:: count: 2
+17: timerToInvalidateFailedLookupResolutions
+18: timerToUpdateProgram
 Output::
 
 PolledWatches::
@@ -264,6 +301,11 @@ Change:: Invalidates module resolution cache
 
 Input::
 
+Before running Timeout callback:: count: 2
+17: timerToInvalidateFailedLookupResolutions
+18: timerToUpdateProgram
+After running Timeout callback:: count: 1
+19: timerToUpdateProgram
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -273,6 +315,9 @@ Change:: Pending updates
 
 Input::
 
+Before running Timeout callback:: count: 1
+19: timerToUpdateProgram
+After running Timeout callback:: count: 0
 Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js
index bd13c13ddaf72..dc45826e354bb 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js
@@ -52,6 +52,262 @@ Change:: Time spent to Transition libFile and file1 to low priority queue
 
 Input::
 
+Before running Timeout callback:: count: 1
+1: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+2: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+2: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+3: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+3: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+4: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+4: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+5: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+5: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+6: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+6: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+7: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+7: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+8: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+8: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+9: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+9: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+10: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+10: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+11: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+11: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+12: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+12: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+13: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+13: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+14: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+14: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+15: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+15: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+16: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+16: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+17: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+17: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+18: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+18: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+19: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+19: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+20: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+20: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+21: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+21: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+22: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+22: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+23: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+23: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+24: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+24: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+25: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+25: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+26: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+26: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+27: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+27: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+28: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+28: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+29: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+29: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+30: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+30: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+31: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+31: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+32: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+32: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+33: pollLowPollingIntervalQueue
+Before running Timeout callback:: count: 1
+33: pollLowPollingIntervalQueue
+After running Timeout callback:: count: 1
+34: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+34: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+35: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+35: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+36: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+36: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+37: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+37: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+38: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+38: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+39: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+39: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+40: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+40: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+41: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+41: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+42: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+42: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+43: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+43: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+44: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+44: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+45: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+45: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+46: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+46: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+47: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+47: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+48: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+48: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+49: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+49: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+50: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+50: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+51: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+51: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+52: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+52: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+53: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+53: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+54: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+54: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+55: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+55: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+56: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+56: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+57: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+57: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+58: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+58: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+59: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+59: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+60: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+60: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+61: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+61: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+62: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+62: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+63: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+63: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+64: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+64: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+65: pollPollingIntervalQueue
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -64,6 +320,12 @@ Input::
 var zz30 = 100;
 
 
+Before running Timeout callback:: count: 1
+65: pollPollingIntervalQueue
+After running Timeout callback:: count: 3
+66: timerToUpdateProgram
+67: pollLowPollingIntervalQueue
+68: pollPollingIntervalQueue
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -73,6 +335,13 @@ Change:: Callbacks: medium priority + high priority queue and scheduled program
 
 Input::
 
+Before running Timeout callback:: count: 3
+66: timerToUpdateProgram
+67: pollLowPollingIntervalQueue
+68: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+69: pollLowPollingIntervalQueue
+70: pollPollingIntervalQueue
 Output::
 >> Screen clear
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -106,6 +375,579 @@ Change:: Polling queues polled and everything is in the high polling queue
 
 Input::
 
+Before running Timeout callback:: count: 2
+69: pollLowPollingIntervalQueue
+70: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+71: pollLowPollingIntervalQueue
+72: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+71: pollLowPollingIntervalQueue
+72: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+73: pollLowPollingIntervalQueue
+74: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+73: pollLowPollingIntervalQueue
+74: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+75: pollLowPollingIntervalQueue
+76: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+75: pollLowPollingIntervalQueue
+76: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+77: pollLowPollingIntervalQueue
+78: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+77: pollLowPollingIntervalQueue
+78: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+79: pollLowPollingIntervalQueue
+80: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+79: pollLowPollingIntervalQueue
+80: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+81: pollLowPollingIntervalQueue
+82: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+81: pollLowPollingIntervalQueue
+82: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+83: pollLowPollingIntervalQueue
+84: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+83: pollLowPollingIntervalQueue
+84: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+85: pollLowPollingIntervalQueue
+86: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+85: pollLowPollingIntervalQueue
+86: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+87: pollLowPollingIntervalQueue
+88: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+87: pollLowPollingIntervalQueue
+88: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+89: pollLowPollingIntervalQueue
+90: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+89: pollLowPollingIntervalQueue
+90: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+91: pollLowPollingIntervalQueue
+92: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+91: pollLowPollingIntervalQueue
+92: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+93: pollLowPollingIntervalQueue
+94: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+93: pollLowPollingIntervalQueue
+94: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+95: pollLowPollingIntervalQueue
+96: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+95: pollLowPollingIntervalQueue
+96: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+97: pollLowPollingIntervalQueue
+98: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+97: pollLowPollingIntervalQueue
+98: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+99: pollLowPollingIntervalQueue
+100: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+99: pollLowPollingIntervalQueue
+100: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+101: pollLowPollingIntervalQueue
+102: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+101: pollLowPollingIntervalQueue
+102: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+103: pollLowPollingIntervalQueue
+104: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+103: pollLowPollingIntervalQueue
+104: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+105: pollLowPollingIntervalQueue
+106: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+105: pollLowPollingIntervalQueue
+106: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+107: pollLowPollingIntervalQueue
+108: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+107: pollLowPollingIntervalQueue
+108: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+109: pollLowPollingIntervalQueue
+110: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+109: pollLowPollingIntervalQueue
+110: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+111: pollLowPollingIntervalQueue
+112: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+111: pollLowPollingIntervalQueue
+112: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+113: pollLowPollingIntervalQueue
+114: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+113: pollLowPollingIntervalQueue
+114: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+115: pollLowPollingIntervalQueue
+116: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+115: pollLowPollingIntervalQueue
+116: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+117: pollLowPollingIntervalQueue
+118: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+117: pollLowPollingIntervalQueue
+118: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+119: pollLowPollingIntervalQueue
+120: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+119: pollLowPollingIntervalQueue
+120: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+121: pollLowPollingIntervalQueue
+122: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+121: pollLowPollingIntervalQueue
+122: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+123: pollLowPollingIntervalQueue
+124: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+123: pollLowPollingIntervalQueue
+124: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+125: pollLowPollingIntervalQueue
+126: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+125: pollLowPollingIntervalQueue
+126: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+127: pollLowPollingIntervalQueue
+128: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+127: pollLowPollingIntervalQueue
+128: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+129: pollLowPollingIntervalQueue
+130: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+129: pollLowPollingIntervalQueue
+130: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+131: pollLowPollingIntervalQueue
+132: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+131: pollLowPollingIntervalQueue
+132: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+133: pollLowPollingIntervalQueue
+134: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+133: pollLowPollingIntervalQueue
+134: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+135: pollLowPollingIntervalQueue
+136: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+135: pollLowPollingIntervalQueue
+136: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+137: pollLowPollingIntervalQueue
+138: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+137: pollLowPollingIntervalQueue
+138: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+139: pollLowPollingIntervalQueue
+140: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+139: pollLowPollingIntervalQueue
+140: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+141: pollLowPollingIntervalQueue
+142: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+141: pollLowPollingIntervalQueue
+142: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+143: pollLowPollingIntervalQueue
+144: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+143: pollLowPollingIntervalQueue
+144: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+145: pollLowPollingIntervalQueue
+146: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+145: pollLowPollingIntervalQueue
+146: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+147: pollLowPollingIntervalQueue
+148: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+147: pollLowPollingIntervalQueue
+148: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+149: pollLowPollingIntervalQueue
+150: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+149: pollLowPollingIntervalQueue
+150: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+151: pollLowPollingIntervalQueue
+152: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+151: pollLowPollingIntervalQueue
+152: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+153: pollLowPollingIntervalQueue
+154: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+153: pollLowPollingIntervalQueue
+154: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+155: pollLowPollingIntervalQueue
+156: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+155: pollLowPollingIntervalQueue
+156: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+157: pollLowPollingIntervalQueue
+158: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+157: pollLowPollingIntervalQueue
+158: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+159: pollLowPollingIntervalQueue
+160: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+159: pollLowPollingIntervalQueue
+160: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+161: pollLowPollingIntervalQueue
+162: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+161: pollLowPollingIntervalQueue
+162: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+163: pollLowPollingIntervalQueue
+164: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+163: pollLowPollingIntervalQueue
+164: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+165: pollLowPollingIntervalQueue
+166: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+165: pollLowPollingIntervalQueue
+166: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+167: pollLowPollingIntervalQueue
+168: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+167: pollLowPollingIntervalQueue
+168: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+169: pollLowPollingIntervalQueue
+170: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+169: pollLowPollingIntervalQueue
+170: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+171: pollLowPollingIntervalQueue
+172: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+171: pollLowPollingIntervalQueue
+172: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+173: pollLowPollingIntervalQueue
+174: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+173: pollLowPollingIntervalQueue
+174: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+175: pollLowPollingIntervalQueue
+176: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+175: pollLowPollingIntervalQueue
+176: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+177: pollLowPollingIntervalQueue
+178: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+177: pollLowPollingIntervalQueue
+178: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+179: pollLowPollingIntervalQueue
+180: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+179: pollLowPollingIntervalQueue
+180: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+181: pollLowPollingIntervalQueue
+182: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+181: pollLowPollingIntervalQueue
+182: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+183: pollLowPollingIntervalQueue
+184: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+183: pollLowPollingIntervalQueue
+184: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+185: pollLowPollingIntervalQueue
+186: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+185: pollLowPollingIntervalQueue
+186: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+187: pollLowPollingIntervalQueue
+188: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+187: pollLowPollingIntervalQueue
+188: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+189: pollLowPollingIntervalQueue
+190: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+189: pollLowPollingIntervalQueue
+190: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+191: pollLowPollingIntervalQueue
+192: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+191: pollLowPollingIntervalQueue
+192: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+193: pollLowPollingIntervalQueue
+194: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+193: pollLowPollingIntervalQueue
+194: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+195: pollPollingIntervalQueue
+196: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+195: pollPollingIntervalQueue
+196: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+197: pollPollingIntervalQueue
+198: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+197: pollPollingIntervalQueue
+198: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+199: pollPollingIntervalQueue
+200: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+199: pollPollingIntervalQueue
+200: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+201: pollPollingIntervalQueue
+202: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+201: pollPollingIntervalQueue
+202: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+203: pollPollingIntervalQueue
+204: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+203: pollPollingIntervalQueue
+204: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+205: pollPollingIntervalQueue
+206: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+205: pollPollingIntervalQueue
+206: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+207: pollPollingIntervalQueue
+208: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+207: pollPollingIntervalQueue
+208: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+209: pollPollingIntervalQueue
+210: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+209: pollPollingIntervalQueue
+210: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+211: pollPollingIntervalQueue
+212: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+211: pollPollingIntervalQueue
+212: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+213: pollPollingIntervalQueue
+214: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+213: pollPollingIntervalQueue
+214: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+215: pollPollingIntervalQueue
+216: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+215: pollPollingIntervalQueue
+216: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+217: pollPollingIntervalQueue
+218: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+217: pollPollingIntervalQueue
+218: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+219: pollPollingIntervalQueue
+220: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+219: pollPollingIntervalQueue
+220: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+221: pollPollingIntervalQueue
+222: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+221: pollPollingIntervalQueue
+222: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+223: pollPollingIntervalQueue
+224: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+223: pollPollingIntervalQueue
+224: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+225: pollPollingIntervalQueue
+226: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+225: pollPollingIntervalQueue
+226: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+227: pollPollingIntervalQueue
+228: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+227: pollPollingIntervalQueue
+228: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+229: pollPollingIntervalQueue
+230: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+229: pollPollingIntervalQueue
+230: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+231: pollPollingIntervalQueue
+232: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+231: pollPollingIntervalQueue
+232: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+233: pollPollingIntervalQueue
+234: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+233: pollPollingIntervalQueue
+234: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+235: pollPollingIntervalQueue
+236: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+235: pollPollingIntervalQueue
+236: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+237: pollPollingIntervalQueue
+238: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+237: pollPollingIntervalQueue
+238: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+239: pollPollingIntervalQueue
+240: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+239: pollPollingIntervalQueue
+240: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+241: pollPollingIntervalQueue
+242: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+241: pollPollingIntervalQueue
+242: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+243: pollPollingIntervalQueue
+244: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+243: pollPollingIntervalQueue
+244: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+245: pollPollingIntervalQueue
+246: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+245: pollPollingIntervalQueue
+246: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+247: pollPollingIntervalQueue
+248: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+247: pollPollingIntervalQueue
+248: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+249: pollPollingIntervalQueue
+250: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+249: pollPollingIntervalQueue
+250: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+251: pollPollingIntervalQueue
+252: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+251: pollPollingIntervalQueue
+252: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+253: pollPollingIntervalQueue
+254: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+253: pollPollingIntervalQueue
+254: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+255: pollPollingIntervalQueue
+256: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+255: pollPollingIntervalQueue
+256: pollPollingIntervalQueue
+After running Timeout callback:: count: 2
+257: pollPollingIntervalQueue
+258: pollPollingIntervalQueue
+Before running Timeout callback:: count: 2
+257: pollPollingIntervalQueue
+258: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+259: pollPollingIntervalQueue
+Before running Timeout callback:: count: 1
+259: pollPollingIntervalQueue
+After running Timeout callback:: count: 1
+260: pollPollingIntervalQueue
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
index 30f9f008dd9fa..f31c731b96f52 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
@@ -73,6 +73,22 @@ Change:: The timeout is to check the status of all files
 
 Input::
 
+Before running Timeout callback:: count: 1
+1: pollQueue
+After running Timeout callback:: count: 1
+2: pollQueue
+Before running Timeout callback:: count: 1
+2: pollQueue
+After running Timeout callback:: count: 1
+3: pollQueue
+Before running Timeout callback:: count: 1
+3: pollQueue
+After running Timeout callback:: count: 1
+4: pollQueue
+Before running Timeout callback:: count: 1
+4: pollQueue
+After running Timeout callback:: count: 1
+5: pollQueue
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -85,6 +101,11 @@ Input::
 var zz30 = 100;
 
 
+Before running Timeout callback:: count: 1
+5: pollQueue
+After running Timeout callback:: count: 2
+6: timerToUpdateProgram
+7: pollQueue
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -94,6 +115,11 @@ Change:: Callbacks: queue and scheduled program update
 
 Input::
 
+Before running Timeout callback:: count: 2
+6: timerToUpdateProgram
+7: pollQueue
+After running Timeout callback:: count: 1
+8: pollQueue
 Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
@@ -131,6 +157,10 @@ Change:: The timeout is to check the status of all files
 
 Input::
 
+Before running Timeout callback:: count: 1
+8: pollQueue
+After running Timeout callback:: count: 1
+9: pollQueue
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
index 2da6a22a3fcc6..3cf6aa54e87ad 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
@@ -112,6 +112,8 @@ Change:: delete fooBar
 Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
index 6845acd2f7aca..f700917831567 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
@@ -117,6 +117,9 @@ Change:: Directory watch updates because of main.js creation
 
 Input::
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateChildWatches
+After running Timeout callback:: count: 0
 Output::
 sysLog:: onTimerToUpdateChildWatches:: 1
 sysLog:: invokingWatchers:: Elapsed:: *ms:: 0
@@ -138,6 +141,8 @@ Input::
 export function temp(): string;
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
index 426c285221c0d..a0bd6b533862f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
@@ -100,6 +100,9 @@ Change:: Directory watch updates because of main.js creation
 
 Input::
 
+Before running Timeout callback:: count: 1
+1: timerToUpdateChildWatches
+After running Timeout callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
@@ -112,6 +115,8 @@ Input::
 export function temp(): string;
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
index 419e37496d76b..b3c2e010a8c5c 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
@@ -95,6 +95,8 @@ Change:: delete fooBar
 Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
index c9b47503ec9c9..09a9a577a1023 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
@@ -118,6 +118,8 @@ Input::
 export function fooBar(): string;
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
index 271e09054efdd..723a79baf878b 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
@@ -99,6 +99,8 @@ Input::
 export function fooBar(): string;
 
 
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 Output::
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js b/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js
index cf8354d11c117..5cc61b565e71f 100644
--- a/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js
+++ b/tests/baselines/reference/tsserver/autoImportProvider/Does-not-schedule-ensureProjectForOpenFiles-on-AutoImportProviderProject-creation.js
@@ -76,7 +76,8 @@ FsWatchesRecursive::
   {}
 
 Info 16   [00:00:39.000] Scheduled: *ensureProjectForOpenFiles*
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: *ensureProjectForOpenFiles*
 
 Info 17   [00:00:41.500] Running: *ensureProjectForOpenFiles*
 Info 18   [00:00:42.500] Before ensureProjectForOpenFiles:
@@ -95,7 +96,7 @@ Info 20   [00:00:52.500] -----------------------------------------------
 Info 20   [00:00:53.500] Open files: 
 Info 20   [00:00:54.500] 	FileName: /index.ts ProjectRootPath: undefined
 Info 20   [00:00:55.500] 		Projects: /tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 20   [00:00:58.500] DirectoryWatcher:: Triggered with package.json :: WatchInfo:  1 undefined Config: /tsconfig.json WatchType: Wild card directory
 Info 21   [00:00:59.500] Config: /tsconfig.json Detected new package.json: package.json
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Classic-module-resolution-mode.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Classic-module-resolution-mode.js
index 234b01844749d..b08f84f71f938 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Classic-module-resolution-mode.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Classic-module-resolution-mode.js
@@ -87,7 +87,8 @@ Info 31   [00:01:05.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /proj/n
 Info 32   [00:01:08.000] DirectoryWatcher:: Triggered with /proj/node_modules/debug/index.d.ts :: WatchInfo: /proj/node_modules 1 undefined Project: /proj/tsconfig.json WatchType: Failed Lookup Locations
 Info 33   [00:01:09.000] Scheduled: /proj/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info 34   [00:01:10.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /proj/node_modules/debug/index.d.ts :: WatchInfo: /proj/node_modules 1 undefined Project: /proj/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+4: /proj/tsconfig.jsonFailedLookupInvalidation
 //// [/proj/node_modules/debug/index.d.ts]
 export {}
 
@@ -113,9 +114,13 @@ FsWatchesRecursive::
 Info 35   [00:01:11.000] Running: /proj/tsconfig.jsonFailedLookupInvalidation
 Info 36   [00:01:12.000] Scheduled: /proj/tsconfig.json
 Info 37   [00:01:13.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+5: /proj/tsconfig.json
+6: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /proj/tsconfig.json
+6: *ensureProjectForOpenFiles*
 
 Info 38   [00:01:14.000] Running: /proj/tsconfig.json
 Info 39   [00:01:15.000] Starting updateGraphWorker: Project: /proj/tsconfig.json
@@ -158,7 +163,7 @@ Info 49   [00:01:33.000] -----------------------------------------------
 Info 49   [00:01:34.000] Open files: 
 Info 49   [00:01:35.000] 	FileName: /proj/foo/boo/app.ts ProjectRootPath: undefined
 Info 49   [00:01:36.000] 		Projects: /proj/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 49   [00:01:37.000] getSemanticDiagnostics:: /proj/foo/boo/app.ts:: 0
 Info 50   [00:01:38.000] getSemanticDiagnostics:: /proj/foo/boo/moo/app.ts:: 0
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Node-module-resolution-mode.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Node-module-resolution-mode.js
index 657dba1d98e8d..29578399832e9 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Node-module-resolution-mode.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/includes-the-parent-folder-FLLs-in-Node-module-resolution-mode.js
@@ -87,7 +87,8 @@ Info 31   [00:01:05.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /proj/n
 Info 32   [00:01:08.000] DirectoryWatcher:: Triggered with /proj/node_modules/debug/index.d.ts :: WatchInfo: /proj/node_modules 1 undefined Project: /proj/tsconfig.json WatchType: Failed Lookup Locations
 Info 33   [00:01:09.000] Scheduled: /proj/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info 34   [00:01:10.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /proj/node_modules/debug/index.d.ts :: WatchInfo: /proj/node_modules 1 undefined Project: /proj/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+4: /proj/tsconfig.jsonFailedLookupInvalidation
 //// [/proj/node_modules/debug/index.d.ts]
 export {}
 
@@ -113,9 +114,13 @@ FsWatchesRecursive::
 Info 35   [00:01:11.000] Running: /proj/tsconfig.jsonFailedLookupInvalidation
 Info 36   [00:01:12.000] Scheduled: /proj/tsconfig.json
 Info 37   [00:01:13.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+5: /proj/tsconfig.json
+6: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /proj/tsconfig.json
+6: *ensureProjectForOpenFiles*
 
 Info 38   [00:01:14.000] Running: /proj/tsconfig.json
 Info 39   [00:01:15.000] Starting updateGraphWorker: Project: /proj/tsconfig.json
@@ -158,7 +163,7 @@ Info 49   [00:01:33.000] -----------------------------------------------
 Info 49   [00:01:34.000] Open files: 
 Info 49   [00:01:35.000] 	FileName: /proj/foo/boo/app.ts ProjectRootPath: undefined
 Info 49   [00:01:36.000] 		Projects: /proj/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 49   [00:01:37.000] getSemanticDiagnostics:: /proj/foo/boo/app.ts:: 0
 Info 50   [00:01:38.000] getSemanticDiagnostics:: /proj/foo/boo/moo/app.ts:: 0
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
index 4e1b729cc7114..9571a35dd7a62 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
@@ -42,7 +42,8 @@ Info 20   [00:00:33.000] readDirectory:: []
 Info 21   [00:00:36.000] DirectoryWatcher:: Triggered with /c/bar.d.ts :: WatchInfo: /c 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info 22   [00:00:37.000] Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation
 Info 23   [00:00:38.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /c/bar.d.ts :: WatchInfo: /c 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: /dev/null/inferredProject1*FailedLookupInvalidation
 //// [/c/bar.d.ts]
 export var y = 1
 
@@ -60,7 +61,9 @@ FsWatches::
 Info 24   [00:00:39.000] Running: /dev/null/inferredProject1*FailedLookupInvalidation
 Info 25   [00:00:40.000] Scheduled: /dev/null/inferredProject1*
 Info 26   [00:00:41.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+2: /dev/null/inferredProject1*
+3: *ensureProjectForOpenFiles*
 
 Info 27   [00:00:42.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info 28   [00:00:43.000] FileWatcher:: Added:: WatchInfo: /c/bar.d.ts 500 undefined WatchType: Closed Script info
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-after-installation.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-after-installation.js
index 28818bf7e162b..9aa6911d5d79e 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-after-installation.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-after-installation.js
@@ -180,7 +180,11 @@ Info 109  [00:02:54.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 110  [00:02:55.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 111  [00:02:56.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js
 Info 112  [00:02:57.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 3
+Timeout callback:: count: 3
+5: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+6: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json]
 {
   "name": "symbol-observable",
@@ -582,7 +586,11 @@ Info 139  [00:03:43.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 140  [00:03:44.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 141  [00:03:45.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
 Info 142  [00:03:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 3
+Timeout callback:: count: 3
+5: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+6: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json]
 {
     "name": "@types/lodash",
@@ -638,7 +646,11 @@ Info 144  [00:03:49.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 145  [00:03:50.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 146  [00:03:51.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
 Info 147  [00:03:52.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 3
+Timeout callback:: count: 3
+5: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+6: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594] deleted
 
 Info 148  [00:04:13.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -676,7 +688,11 @@ Info 179  [00:04:56.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 180  [00:04:57.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 181  [00:04:58.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts
 Info 182  [00:04:59.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 3
+Timeout callback:: count: 3
+5: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+6: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts]
 
 // Stub for lodash
@@ -718,7 +734,11 @@ Info 204  [00:05:41.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 205  [00:05:42.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 206  [00:05:43.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
 Info 207  [00:05:44.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 3
+Timeout callback:: count: 3
+5: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+6: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041]
 {
   "_args": [
@@ -1018,7 +1038,11 @@ Info 271  [00:07:13.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 272  [00:07:14.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 273  [00:07:15.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.bin
 Info 274  [00:07:16.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 3
+Timeout callback:: count: 3
+32: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+33: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+34: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041] deleted
 
 PolledWatches::
@@ -1369,7 +1393,10 @@ Info 591  [00:13:54.000] DirectoryWatcher:: Triggered with /user/username/rootfo
 Info 592  [00:13:55.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
 Info 593  [00:13:56.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 594  [00:13:57.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+78: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+87: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+88: *ensureProjectForOpenFiles*
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json]
 {
   "name": "symbol-observable",
@@ -1791,9 +1818,13 @@ declare namespace _ {
 Info 595  [00:13:58.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
 Info 596  [00:13:59.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
 Info 597  [00:14:00.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 2
+89: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+90: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+89: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+90: *ensureProjectForOpenFiles*
 
 Info 598  [00:14:01.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
 Info 599  [00:14:02.000] Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
@@ -1839,7 +1870,7 @@ Info 615  [00:14:26.000] -----------------------------------------------
 Info 615  [00:14:27.000] Open files: 
 Info 615  [00:14:28.000] 	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
 Info 615  [00:14:29.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/rootfolder/otherfolder/a/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-inbetween-installation.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-inbetween-installation.js
index 18dfefecfe77e..600c5207a5f98 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-inbetween-installation.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-works-when-timeout-occurs-inbetween-installation.js
@@ -180,7 +180,10 @@ Info 109  [00:02:54.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 110  [00:02:55.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 111  [00:02:56.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js
 Info 112  [00:02:57.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+5: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+6: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json]
 {
   "name": "symbol-observable",
@@ -555,9 +558,13 @@ FsWatchesRecursive::
 Info 113  [00:02:58.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
 Info 114  [00:02:59.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
 Info 115  [00:03:00.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 2
+8: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+9: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+8: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+9: *ensureProjectForOpenFiles*
 
 Info 116  [00:03:01.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
 Info 117  [00:03:02.000] Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
@@ -585,7 +592,7 @@ Info 125  [00:03:18.000] -----------------------------------------------
 Info 125  [00:03:19.000] Open files: 
 Info 125  [00:03:20.000] 	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
 Info 125  [00:03:21.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 125  [00:03:31.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 126  [00:03:32.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -617,7 +624,7 @@ Info 151  [00:04:07.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 152  [00:04:08.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 153  [00:04:09.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
 Info 154  [00:04:10.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json]
 {
     "name": "@types/lodash",
@@ -668,17 +675,25 @@ module.exports = require('./lodash');
 
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
+
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
 
 Info 155  [00:04:12.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 156  [00:04:13.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 157  [00:04:14.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 158  [00:04:15.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
 Info 159  [00:04:16.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594] deleted
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
+
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
 
 Info 160  [00:04:37.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 161  [00:04:38.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -715,7 +730,7 @@ Info 191  [00:05:20.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 192  [00:05:21.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 193  [00:05:22.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts
 Info 194  [00:05:23.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts]
 
 // Stub for lodash
@@ -732,7 +747,11 @@ declare namespace _ {
 }
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
+
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
 
 Info 195  [00:05:36.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 196  [00:05:37.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -759,7 +778,7 @@ Info 216  [00:06:05.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 217  [00:06:06.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 218  [00:06:07.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
 Info 219  [00:06:08.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041]
 {
   "_args": [
@@ -992,7 +1011,11 @@ Before checking timeout queue length (0) and running
 
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
+
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
 
 Info 220  [00:06:10.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 221  [00:06:11.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1061,7 +1084,10 @@ Info 283  [00:07:37.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 284  [00:07:38.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Info 285  [00:07:39.000] Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.bin
 Info 286  [00:07:40.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+34: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+35: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+36: *ensureProjectForOpenFiles*
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041] deleted
 
 PolledWatches::
@@ -1095,9 +1121,13 @@ FsWatchesRecursive::
 Info 287  [00:07:41.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
 Info 288  [00:07:42.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
 Info 289  [00:07:43.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 2
+37: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+38: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+37: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+38: *ensureProjectForOpenFiles*
 
 Info 290  [00:07:44.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
 Info 291  [00:07:45.000] Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
@@ -1125,7 +1155,7 @@ Info 299  [00:08:01.000] -----------------------------------------------
 Info 299  [00:08:02.000] Open files: 
 Info 299  [00:08:03.000] 	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
 Info 299  [00:08:04.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 299  [00:08:06.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 300  [00:08:07.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
@@ -1447,7 +1477,10 @@ Info 615  [00:14:42.000] DirectoryWatcher:: Triggered with /user/username/rootfo
 Info 616  [00:14:43.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
 Info 617  [00:14:44.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 618  [00:14:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+82: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+91: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+92: *ensureProjectForOpenFiles*
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json]
 {
   "name": "symbol-observable",
@@ -1869,9 +1902,13 @@ declare namespace _ {
 Info 619  [00:14:46.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
 Info 620  [00:14:47.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
 Info 621  [00:14:48.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 2
+93: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+94: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+93: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+94: *ensureProjectForOpenFiles*
 
 Info 622  [00:14:49.000] Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
 Info 623  [00:14:50.000] Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
@@ -1917,7 +1954,7 @@ Info 639  [00:15:14.000] -----------------------------------------------
 Info 639  [00:15:15.000] Open files: 
 Info 639  [00:15:16.000] 	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
 Info 639  [00:15:17.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/rootfolder/otherfolder/a/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
index d915e56762513..b342d7bb22cec 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
@@ -99,7 +99,9 @@ Info 19   [00:01:00.000] DirectoryWatcher:: Triggered with /users/someuser/work/
 Info 20   [00:01:01.000] Scheduled: /Users/someuser/work/applications/frontend/tsconfig.json
 Info 21   [00:01:02.000] Scheduled: *ensureProjectForOpenFiles*
 Info 22   [00:01:03.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /Users/someuser/work/applications/frontend/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts]
 export class Cookie { }
 
@@ -161,7 +163,7 @@ Info 33   [00:01:22.000] -----------------------------------------------
 Info 33   [00:01:23.000] Open files: 
 Info 33   [00:01:24.000] 	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
 Info 33   [00:01:25.000] 		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /users/someuser/work/applications/frontend/types:
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
index f7178edba04bc..10da8ac8d05cd 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
@@ -99,7 +99,9 @@ Info 19   [00:01:00.000] DirectoryWatcher:: Triggered with /Users/someuser/work/
 Info 20   [00:01:01.000] Scheduled: /Users/someuser/work/applications/frontend/tsconfig.json
 Info 21   [00:01:02.000] Scheduled: *ensureProjectForOpenFiles*
 Info 22   [00:01:03.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /Users/someuser/work/applications/frontend/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts]
 export class Cookie { }
 
@@ -161,7 +163,7 @@ Info 33   [00:01:22.000] -----------------------------------------------
 Info 33   [00:01:23.000] Open files: 
 Info 33   [00:01:24.000] 	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
 Info 33   [00:01:25.000] 		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /Users/someuser/work/applications/frontend/types:
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js
index ba4d6b3496e84..727975a4b0277 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js
@@ -82,7 +82,9 @@ Info 19   [00:00:59.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 20   [00:01:00.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 21   [00:01:01.000] Scheduled: *ensureProjectForOpenFiles*
 Info 22   [00:01:02.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/folder2/module3.ts]
 import * as M from "folder1/module1";
 
@@ -146,7 +148,7 @@ Info 33   [00:01:21.000] -----------------------------------------------
 Info 33   [00:01:22.000] Open files: 
 Info 33   [00:01:23.000] 	FileName: /user/username/projects/myproject/client/linktofolder2/module2.ts ProjectRootPath: undefined
 Info 33   [00:01:24.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-node_modules-dont-receive-event-for-the-@types-file-addition.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-node_modules-dont-receive-event-for-the-@types-file-addition.js
index b84d65d1e1d5e..bb7906dc9534a 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-node_modules-dont-receive-event-for-the-@types-file-addition.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-node_modules-dont-receive-event-for-the-@types-file-addition.js
@@ -87,7 +87,10 @@ Info 39   [00:01:15.000] Scheduled: /user/username/folder/myproject/tsconfig.jso
 Info 40   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 41   [00:01:17.000] Scheduled: /user/username/folder/myproject/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info 42   [00:01:18.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/folder/myproject/node_modules/@types :: WatchInfo: /user/username/folder/myproject/node_modules/@types 1 undefined Project: /user/username/folder/myproject/tsconfig.json WatchType: Type roots
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+11: /user/username/folder/myproject/tsconfig.json
+12: *ensureProjectForOpenFiles*
+13: /user/username/folder/myproject/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/folder/myproject/node_modules/@types/debug/index.d.ts]
 export {}
 
@@ -128,6 +131,7 @@ Info 50   [00:01:26.000] 	Files (3)
 	  Matched by default include pattern '**/*'
 
 Info 51   [00:01:27.000] -----------------------------------------------
-After running timeout callbacks
+After running Timeout callback:: count: 1
+14: *ensureProjectForOpenFiles*
 
 Info 52   [00:01:28.000] getSemanticDiagnostics:: /user/username/folder/myproject/app.ts:: 0
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cancellationT/Geterr-is-cancellable.js b/tests/baselines/reference/tsserver/cancellationT/Geterr-is-cancellable.js
index 388aa2e556cce..290da5baa58f0 100644
--- a/tests/baselines/reference/tsserver/cancellationT/Geterr-is-cancellable.js
+++ b/tests/baselines/reference/tsserver/cancellationT/Geterr-is-cancellable.js
@@ -94,12 +94,13 @@ Info 19   [00:00:34.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 20   [00:00:35.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
 TestServerCancellationToken:: resetRequest:: 2 is as expected
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -146,13 +147,14 @@ Info 24   [00:00:39.000] response:
 After request
 
 TestServerCancellationToken:: Setting request to cancel:: 3
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+2: checkOne
 
 TestServerCancellationToken:: Cancellation is requested
 Info 25   [00:00:40.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
 TestServerCancellationToken:: resetRequest:: 3 is as expected
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -175,21 +177,23 @@ Info 27   [00:00:42.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 28   [00:00:43.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
 TestServerCancellationToken:: resetRequest:: 5 is as expected
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 TestServerCancellationToken:: Setting request to cancel:: 5
-Before running immediate callbacks
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 TestServerCancellationToken:: Cancellation is requested
 Info 29   [00:00:44.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":5}}
 TestServerCancellationToken:: resetRequest:: 5 is as expected
-After running immediate callbacks
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -212,28 +216,32 @@ Info 31   [00:00:46.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+4: checkOne
 
 Info 32   [00:00:47.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
 TestServerCancellationToken:: resetRequest:: 6 is as expected
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks
+Before running Immedidate callback:: count: 1
+2: semanticCheck
 
 Info 33   [00:00:48.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
 TestServerCancellationToken:: resetRequest:: 6 is as expected
-After running immediate callbacks
+After running Immedidate callback:: count: 1
+3: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: suggestionCheck
 
 Info 34   [00:00:49.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
 Info 35   [00:00:50.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
 TestServerCancellationToken:: resetRequest:: 6 is as expected
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -256,12 +264,13 @@ Info 37   [00:00:52.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+5: checkOne
 
 Info 38   [00:00:53.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
 TestServerCancellationToken:: resetRequest:: 7 is as expected
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/cancellationT/is-attached-to-request.js b/tests/baselines/reference/tsserver/cancellationT/is-attached-to-request.js
index c62b8491c8ffa..4f29b60500983 100644
--- a/tests/baselines/reference/tsserver/cancellationT/is-attached-to-request.js
+++ b/tests/baselines/reference/tsserver/cancellationT/is-attached-to-request.js
@@ -120,21 +120,25 @@ Info 16   [00:00:31.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: checkOne
 
 ServerCancellationToken:: Cancellation Request id:: 2
 Info 17   [00:00:32.000] Session does not support events: ignored event: {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/app.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 ServerCancellationToken:: Cancellation Request id:: 2
 Info 18   [00:00:33.000] Session does not support events: ignored event: {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a/b/app.ts","diagnostics":[]}}
-After running immediate callbacks
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 ServerCancellationToken:: Cancellation Request id:: 2
 Info 19   [00:00:34.000] Session does not support events: ignored event: {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/a/b/app.ts","diagnostics":[]}}
 Info 20   [00:00:35.000] Session does not support events: ignored event: {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js
index d0f4f7ed0ecc2..0d77b8a01a657 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-uptodate-with-new-files.js
@@ -165,7 +165,9 @@ Info 24   [00:00:55.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer3.t
 Info 25   [00:00:56.000] Scheduled: /a/b/tsconfig.json
 Info 26   [00:00:57.000] Scheduled: *ensureProjectForOpenFiles*
 Info 27   [00:00:58.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file1Consumer3.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/file1Consumer3.ts]
 import {Foo} from "./moduleFile1"; let y = Foo();
 
@@ -221,7 +223,7 @@ Info 38   [00:01:17.000] -----------------------------------------------
 Info 38   [00:01:18.000] Open files: 
 Info 38   [00:01:19.000] 	FileName: /a/b/moduleFile1.ts ProjectRootPath: undefined
 Info 38   [00:01:20.000] 		Projects: /a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js
index 2466773711036..598b277f86708 100644
--- a/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js
+++ b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js
@@ -89,7 +89,8 @@ Info 30   [00:01:00.000] Search path: /a/b/projects/project/src
 Info 31   [00:01:01.000] For info: /a/b/projects/project/src/file1.ts :: No config files found.
 Info 32   [00:01:02.000] Scheduled: *ensureProjectForOpenFiles*
 Info 33   [00:01:03.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/src/tsconfig.json 2:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: *ensureProjectForOpenFiles*
 //// [/a/b/projects/project/src/tsconfig.json] deleted
 
 FsWatches::
@@ -129,7 +130,7 @@ Info 48   [00:01:23.500] -----------------------------------------------
 Info 48   [00:01:24.500] Open files: 
 Info 48   [00:01:25.500] 	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
 Info 48   [00:01:26.500] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/projects/project/src/tsconfig.json: *new*
diff --git a/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js
index 6d2a7d219f440..1a8db76c245a4 100644
--- a/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js
+++ b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js
@@ -89,7 +89,8 @@ Info 30   [00:01:00.000] Search path: /a/b/projects/project/src
 Info 31   [00:01:01.000] For info: /a/b/projects/project/src/file1.ts :: No config files found.
 Info 32   [00:01:02.000] Scheduled: *ensureProjectForOpenFiles*
 Info 33   [00:01:03.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/src/tsconfig.json 2:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: *ensureProjectForOpenFiles*
 //// [/a/b/projects/project/src/tsconfig.json] deleted
 
 FsWatches::
@@ -131,7 +132,7 @@ Info 50   [00:01:25.500] -----------------------------------------------
 Info 50   [00:01:26.500] Open files: 
 Info 50   [00:01:27.500] 	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
 Info 50   [00:01:28.500] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/projects/project/src/tsconfig.json: *new*
diff --git a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js
index 5e203a87a4f08..db1dc0b16fa79 100644
--- a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js
+++ b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js
@@ -63,7 +63,9 @@ Info 26   [00:00:53.000] For info: /a/b/projects/project/src/index.ts :: Config
 Info 27   [00:00:54.000] Scheduled: /a/b/projects/project/tsconfig.json, Cancelled earlier one
 Info 28   [00:00:55.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 29   [00:00:56.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 0:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/b/projects/project/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b/projects/project/tsconfig.json]
 {}
 
@@ -150,7 +152,7 @@ Info 53   [00:01:34.000] -----------------------------------------------
 Info 53   [00:01:35.000] Open files: 
 Info 53   [00:01:36.000] 	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
 Info 53   [00:01:37.000] 		Projects: /a/b/projects/project/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/projects/project/src/node_modules/@types:
@@ -199,7 +201,8 @@ Info 63   [00:01:49.000] Search path: /a/b/projects/project/src
 Info 64   [00:01:50.000] For info: /a/b/projects/project/src/index.ts :: No config files found.
 Info 65   [00:01:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 66   [00:01:52.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 2:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+5: *ensureProjectForOpenFiles*
 //// [/a/b/projects/project/tsconfig.json] deleted
 
 PolledWatches::
@@ -255,7 +258,7 @@ Info 79   [00:02:13.500] -----------------------------------------------
 Info 79   [00:02:14.500] Open files: 
 Info 79   [00:02:15.500] 	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
 Info 79   [00:02:16.500] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/projects/project/src/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js
index b80ad15e81699..1bf6d04e23e8a 100644
--- a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js
+++ b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js
@@ -82,7 +82,8 @@ Info 26   [00:00:54.000] Search path: /a/b/projects/project/src
 Info 27   [00:00:55.000] For info: /a/b/projects/project/src/index.ts :: No config files found.
 Info 28   [00:00:56.000] Scheduled: *ensureProjectForOpenFiles*
 Info 29   [00:00:57.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 2:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: *ensureProjectForOpenFiles*
 //// [/a/b/projects/project/tsconfig.json] deleted
 
 FsWatches::
@@ -124,7 +125,7 @@ Info 46   [00:01:19.500] -----------------------------------------------
 Info 46   [00:01:20.500] Open files: 
 Info 46   [00:01:21.500] 	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
 Info 46   [00:01:22.500] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/projects/project/src/tsconfig.json: *new*
@@ -157,7 +158,9 @@ Info 55   [00:01:34.500] For info: /a/b/projects/project/src/index.ts :: Config
 Info 56   [00:01:35.500] Scheduled: /a/b/projects/project/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:36.500] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:37.500] Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 0:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+4: /a/b/projects/project/tsconfig.json
+5: *ensureProjectForOpenFiles*
 //// [/a/b/projects/project/tsconfig.json]
 {}
 
@@ -248,7 +251,7 @@ Info 82   [00:02:15.500] -----------------------------------------------
 Info 82   [00:02:16.500] Open files: 
 Info 82   [00:02:17.500] 	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
 Info 82   [00:02:18.500] 		Projects: /a/b/projects/project/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/projects/project/src/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js
index 234869256b150..d335de36be5a5 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update-buts-its-open-file-references-are-all-closed-when-the-update-happens.js
@@ -193,7 +193,9 @@ Info 47   [00:02:10.000] 		Projects: /dev/null/inferredProject1*
 Info 47   [00:02:11.000] 	FileName: /a/file4.ts ProjectRootPath: undefined
 Info 47   [00:02:12.000] 		Projects: /dev/null/inferredProject2*
 Configured project: /a/b/tsconfig.json hasOpenRef:: true isClosed: false
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+2: /a/b/tsconfig.json
+3: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /a/lib/lib.d.ts:
@@ -290,7 +292,7 @@ Info 66   [00:02:56.000] 	FileName: /a/b/src/file2.ts ProjectRootPath: undefined
 Info 66   [00:02:57.000] 		Projects: /a/b/tsconfig.json
 Info 66   [00:02:58.000] 	FileName: /a/file4.ts ProjectRootPath: undefined
 Info 66   [00:02:59.000] 		Projects: /dev/null/inferredProject2*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js
index 539dea6e8f7ba..ba90b39993ee8 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js
@@ -147,7 +147,9 @@ Info 41   [00:01:51.000] For info: /a/b/src/file2.ts :: Config file name: /a/b/t
 Info 42   [00:01:52.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 43   [00:01:53.000] Scheduled: *ensureProjectForOpenFiles*
 Info 44   [00:01:54.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+2: /a/b/tsconfig.json
+3: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json]
 {}
 
@@ -251,7 +253,7 @@ Info 64   [00:02:46.000] 	FileName: /a/b/file3.ts ProjectRootPath: undefined
 Info 64   [00:02:47.000] 		Projects: /a/b/tsconfig.json
 Info 64   [00:02:48.000] 	FileName: /a/file4.ts ProjectRootPath: undefined
 Info 64   [00:02:49.000] 		Projects: /dev/null/inferredProject2*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js b/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js
index 83d264d78be45..47f4cc82404d2 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js
@@ -97,7 +97,9 @@ Info 35   [00:01:15.000] Search path: /user/username/projects/myproject
 Info 36   [00:01:16.000] For info: /user/username/projects/myproject/commonFile2.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
 Info 37   [00:01:17.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 38   [00:01:18.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/tsconfig.json]
 {
                     "files": ["commonFile1.ts"]
@@ -187,7 +189,7 @@ Info 57   [00:02:01.000] 	FileName: /user/username/projects/myproject/commonFile
 Info 57   [00:02:02.000] 		Projects: /user/username/projects/myproject/tsconfig.json
 Info 57   [00:02:03.000] 	FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
 Info 57   [00:02:04.000] 		Projects: /dev/null/inferredProject2*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 57   [00:02:06.000] FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info 58   [00:02:07.000] `remove Project::
@@ -211,7 +213,8 @@ Info 66   [00:02:15.000] Search path: /user/username/projects/myproject
 Info 67   [00:02:16.000] For info: /user/username/projects/myproject/commonFile2.ts :: No config files found.
 Info 68   [00:02:17.000] Scheduled: *ensureProjectForOpenFiles*
 Info 69   [00:02:18.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+5: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/tsconfig.json] deleted
 
 Info 70   [00:02:19.500] Running: *ensureProjectForOpenFiles*
@@ -257,4 +260,4 @@ Info 78   [00:02:45.500] 	FileName: /user/username/projects/myproject/commonFile
 Info 78   [00:02:46.500] 		Projects: /dev/null/inferredProject1*
 Info 78   [00:02:47.500] 	FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
 Info 78   [00:02:48.500] 		Projects: /dev/null/inferredProject2*
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js b/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js
index cf03e3e00be99..c88ecb42c8f7a 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js
@@ -63,7 +63,9 @@ Info 16   [00:00:39.000] DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :
 Info 17   [00:00:40.000] Scheduled: /a/b/tsconfig.json
 Info 18   [00:00:41.000] Scheduled: *ensureProjectForOpenFiles*
 Info 19   [00:00:42.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/commonFile2.ts]
 let y = 1
 
@@ -118,7 +120,7 @@ Info 30   [00:01:01.000] -----------------------------------------------
 Info 30   [00:01:02.000] Open files: 
 Info 30   [00:01:03.000] 	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
 Info 30   [00:01:04.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js b/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
index 6f98899db4218..98376ee338fe3 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
+++ b/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
@@ -48,7 +48,9 @@ Info 14   [00:00:36.000] FileWatcher:: Triggered with /a/b/tsconfig.json 1:: Wat
 Info 15   [00:00:37.000] Scheduled: /a/b/tsconfig.json
 Info 16   [00:00:38.000] Scheduled: *ensureProjectForOpenFiles*
 Info 17   [00:00:39.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json]
 {"compilerOptions":{},"files":["f1.ts","f2.ts"]}
 
@@ -106,7 +108,7 @@ Info 30   [00:01:00.000] -----------------------------------------------
 Info 30   [00:01:01.000] Open files: 
 Info 30   [00:01:02.000] 	FileName: /a/b/f1.ts ProjectRootPath: undefined
 Info 30   [00:01:03.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index 800224839d7a0..31029acadd156 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tsserver/configuredProjects/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -47,7 +47,9 @@ Info 16   [00:00:35.000] DirectoryWatcher:: Triggered with /a/b/f2.ts :: WatchIn
 Info 17   [00:00:36.000] Scheduled: /a/b/tsconfig.json
 Info 18   [00:00:37.000] Scheduled: *ensureProjectForOpenFiles*
 Info 19   [00:00:38.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/f2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/f2.ts]
 let y = 1
 
@@ -99,7 +101,7 @@ Info 30   [00:00:57.000] -----------------------------------------------
 Info 30   [00:00:58.000] Open files: 
 Info 30   [00:00:59.000] 	FileName: /a/b/f1.ts ProjectRootPath: undefined
 Info 30   [00:01:00.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js b/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js
index c01df9fb7c4e1..b297b8747d98d 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/can-update-configured-project-when-set-of-root-files-was-not-changed.js
@@ -53,7 +53,9 @@ Info 15   [00:00:37.000] FileWatcher:: Triggered with /a/b/tsconfig.json 1:: Wat
 Info 16   [00:00:38.000] Scheduled: /a/b/tsconfig.json
 Info 17   [00:00:39.000] Scheduled: *ensureProjectForOpenFiles*
 Info 18   [00:00:40.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json]
 {"compilerOptions":{"outFile":"out.js"},"files":["f1.ts","f2.ts"]}
 
@@ -107,4 +109,4 @@ Info 30   [00:01:00.000] -----------------------------------------------
 Info 30   [00:01:01.000] Open files: 
 Info 30   [00:01:02.000] 	FileName: /a/b/f1.ts ProjectRootPath: undefined
 Info 30   [00:01:03.000] 		Projects: /a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js b/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
index 147afc6ee748a..f9efcf776e7d1 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
@@ -70,7 +70,8 @@ Info 17   [00:00:39.000] 		Projects: /a/b/tsconfig.json
 Info 17   [00:00:42.000] DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 18   [00:00:43.000] Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 19   [00:00:44.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: /a/b/tsconfig.jsonFailedLookupInvalidation
 //// [/a/b/file2.ts]
 export classc { method2() { return 10; } }
 
@@ -92,9 +93,13 @@ FsWatches::
 Info 20   [00:00:45.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 21   [00:00:46.000] Scheduled: /a/b/tsconfig.json
 Info 22   [00:00:47.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+2: /a/b/tsconfig.json
+3: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+2: /a/b/tsconfig.json
+3: *ensureProjectForOpenFiles*
 
 Info 23   [00:00:48.000] Running: /a/b/tsconfig.json
 Info 24   [00:00:49.000] Starting updateGraphWorker: Project: /a/b/tsconfig.json
@@ -134,7 +139,7 @@ Info 35   [00:01:08.000] -----------------------------------------------
 Info 35   [00:01:09.000] Open files: 
 Info 35   [00:01:10.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 35   [00:01:11.000] 		Projects: /a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js
index 5eaba9ce3cfa1..7c47e938cada0 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js
@@ -226,44 +226,48 @@ Info 48   [00:01:34.000] response:
     }
 After request
 
-Checking timeout queue length: 1
-
-Before running timeout callback1
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 49   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback1
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 50   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 51   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 1
+After running Immedidate callback:: count: 0
 
-Before running timeout callback2
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 52   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback2
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 53   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 54   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
 Info 55   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one.js
index f4bbf003f4c10..68bd1b632dd72 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-after-old-one.js
@@ -186,44 +186,58 @@ Info 37   [00:01:20.000] response:
     }
 After request
 
-Checking timeout queue length: 3
-
-Before running timeout callback3
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: checkOne
 
+Invoking Timeout callback:: timeoutId:: 3:: checkOne
 Info 38   [00:01:21.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback3
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 39   [00:01:22.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 40   [00:01:23.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 3
+After running Immedidate callback:: count: 0
 
-Before running timeout callback4
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+4: checkOne
 
+Invoking Timeout callback:: timeoutId:: 4:: checkOne
 Info 41   [00:01:24.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback4
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 42   [00:01:25.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 43   [00:01:26.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
 Info 44   [00:01:27.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js
index c4e01536818ff..13a3d2939c497 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js
@@ -226,44 +226,48 @@ Info 48   [00:01:34.000] response:
     }
 After request
 
-Checking timeout queue length: 1
-
-Before running timeout callback1
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 49   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback1
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 50   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 51   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 1
+After running Immedidate callback:: count: 0
 
-Before running timeout callback2
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 52   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback2
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 53   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 54   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
 Info 55   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one.js
index 2a8a3fdbf70b6..4f1e7d7c5dc17 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-after-watcher-is-invoked,-ask-errors-on-it-before-old-one.js
@@ -186,44 +186,58 @@ Info 37   [00:01:20.000] response:
     }
 After request
 
-Checking timeout queue length: 3
-
-Before running timeout callback3
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: checkOne
 
+Invoking Timeout callback:: timeoutId:: 3:: checkOne
 Info 38   [00:01:21.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback3
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 39   [00:01:22.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 40   [00:01:23.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 3
+After running Immedidate callback:: count: 0
 
-Before running timeout callback4
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+4: checkOne
 
+Invoking Timeout callback:: timeoutId:: 4:: checkOne
 Info 41   [00:01:24.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback4
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 42   [00:01:25.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 43   [00:01:26.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
 Info 44   [00:01:27.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js
index d40dda53f2421..2d2d52df8a896 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one-without-file-being-in-config.js
@@ -226,44 +226,48 @@ Info 48   [00:01:34.000] response:
     }
 After request
 
-Checking timeout queue length: 1
-
-Before running timeout callback1
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 49   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback1
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 50   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 51   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 1
+After running Immedidate callback:: count: 0
 
-Before running timeout callback2
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 52   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback2
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 53   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 54   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
 Info 55   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one.js
index ac18e987c9fb1..6660a25e3cc4a 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-after-old-one.js
@@ -227,10 +227,12 @@ Info 49   [00:01:35.000] response:
     }
 After request
 
-Checking timeout queue length: 3
-
-Before running timeout callback3
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: checkOne
 
+Invoking Timeout callback:: timeoutId:: 3:: checkOne
 Info 50   [00:01:36.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/sub/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info 51   [00:01:37.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/sub/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info 52   [00:01:38.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
@@ -258,7 +260,9 @@ Info 58   [00:01:44.000] 	Files (4)
 Info 59   [00:01:45.000] -----------------------------------------------
 Info 60   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback3
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -292,36 +296,46 @@ FsWatchesRecursive::
 /user/username/projects/myproject/src:
   {}
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 61   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 62   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 3
+After running Immedidate callback:: count: 0
 
-Before running timeout callback4
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+4: checkOne
 
+Invoking Timeout callback:: timeoutId:: 4:: checkOne
 Info 63   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback4
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 64   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 65   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
 Info 66   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js
index 0ca8fc88c53f2..cf912f2dd9256 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one-without-file-being-in-config.js
@@ -226,44 +226,48 @@ Info 48   [00:01:34.000] response:
     }
 After request
 
-Checking timeout queue length: 1
-
-Before running timeout callback1
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 49   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback1
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 50   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 51   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 1
+After running Immedidate callback:: count: 0
 
-Before running timeout callback2
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 52   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback2
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 53   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 54   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
 Info 55   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one.js b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one.js
index 4f5ce208cbd45..368712be6e7cb 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/creating-new-file-and-then-open-it-before-watcher-is-invoked,-ask-errors-on-it-before-old-one.js
@@ -227,30 +227,39 @@ Info 49   [00:01:35.000] response:
     }
 After request
 
-Checking timeout queue length: 3
-
-Before running timeout callback3
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: checkOne
 
+Invoking Timeout callback:: timeoutId:: 3:: checkOne
 Info 50   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running timeout callback3
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 51   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 52   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/sub/fooBar.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 3
+After running Immedidate callback:: count: 0
 
-Before running timeout callback4
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
+4: checkOne
 
+Invoking Timeout callback:: timeoutId:: 4:: checkOne
 Info 53   [00:01:39.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/sub/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info 54   [00:01:40.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/sub/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info 55   [00:01:41.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
@@ -278,7 +287,9 @@ Info 61   [00:01:47.000] 	Files (4)
 Info 62   [00:01:48.000] -----------------------------------------------
 Info 63   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running timeout callback4
+After running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -312,16 +323,19 @@ FsWatchesRecursive::
 /user/username/projects/myproject/src:
   {}
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 64   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 65   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/foo.ts","diagnostics":[]}}
 Info 66   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js b/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js
index 29d163e6892ee..430a16124b040 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/handle-recreated-files-correctly.js
@@ -60,7 +60,9 @@ Info 22   [00:00:42.000] DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :
 Info 23   [00:00:43.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 24   [00:00:44.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 25   [00:00:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /a/b/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b/commonFile2.ts] deleted
 
 PolledWatches::
@@ -106,13 +108,15 @@ Info 35   [00:01:03.000] -----------------------------------------------
 Info 35   [00:01:04.000] Open files: 
 Info 35   [00:01:05.000] 	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
 Info 35   [00:01:06.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 35   [00:01:09.000] DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
 Info 36   [00:01:10.000] Scheduled: /a/b/tsconfig.json
 Info 37   [00:01:11.000] Scheduled: *ensureProjectForOpenFiles*
 Info 38   [00:01:12.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/b/commonFile2.ts]
 let y = 1
 
@@ -150,7 +154,7 @@ Info 49   [00:01:31.000] -----------------------------------------------
 Info 49   [00:01:32.000] Open files: 
 Info 49   [00:01:33.000] 	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
 Info 49   [00:01:34.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js b/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js
index 13330da641c49..f84304bbdb332 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/open-file-become-a-part-of-configured-project-if-it-is-referenced-from-root-file.js
@@ -92,7 +92,9 @@ Info 46   [00:01:28.000] For info: /user/username/projects/myproject/a/c/f3.ts :
 Info 47   [00:01:29.000] Scheduled: /user/username/projects/myproject/a/c/tsconfig.json, Cancelled earlier one
 Info 48   [00:01:30.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 49   [00:01:31.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/a/c/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/c/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/a/c/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/a/c/tsconfig.json]
 {"compilerOptions":{},"files":["f2.ts","f3.ts"]}
 
@@ -225,7 +227,7 @@ Info 88   [00:02:34.000] 	FileName: /user/username/projects/myproject/a/b/f1.ts
 Info 88   [00:02:35.000] 		Projects: /user/username/projects/myproject/a/c/tsconfig.json
 Info 88   [00:02:36.000] 	FileName: /user/username/projects/myproject/a/c/f3.ts ProjectRootPath: undefined
 Info 88   [00:02:37.000] 		Projects: /user/username/projects/myproject/a/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-be-tolerated-without-crashing-the-server.js b/tests/baselines/reference/tsserver/configuredProjects/should-be-tolerated-without-crashing-the-server.js
index 5c601500b3097..f474c46b481d1 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/should-be-tolerated-without-crashing-the-server.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-be-tolerated-without-crashing-the-server.js
@@ -60,7 +60,7 @@ Info 27   [00:00:43.000] -----------------------------------------------
 Info 27   [00:00:44.000] Open files: 
 Info 27   [00:00:45.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 27   [00:00:46.000] 		Projects: /dev/null/inferredProject1*
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/app: *new*
@@ -78,4 +78,4 @@ FsWatches::
 /a/b/tsconfig.json: *new*
   {}
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js
index 5d57cd3ebcab6..cf4a979937594 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -111,7 +111,9 @@ Info 32   [00:01:21.000] FileWatcher:: Triggered with /a/b/tsconfig.json 1:: Wat
 Info 33   [00:01:22.000] Scheduled: /a/b/tsconfig.json
 Info 34   [00:01:23.000] Scheduled: *ensureProjectForOpenFiles*
 Info 35   [00:01:24.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json]
 {
                 "compilerOptions": {
@@ -230,7 +232,7 @@ Info 69   [00:02:23.000] 	FileName: /a/b/node_modules/module1.ts ProjectRootPath
 Info 69   [00:02:24.000] 		Projects: /dev/null/inferredProject2*
 Info 69   [00:02:25.000] 	FileName: /a/module1.ts ProjectRootPath: undefined
 Info 69   [00:02:26.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js b/tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js
index a8067bf936f3a..bb78d84961aa8 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js
@@ -103,7 +103,10 @@ Info 34   [00:01:23.000] Scheduled: /user/username/projects/myproject/a/tsconfig
 Info 35   [00:01:24.000] Scheduled: /user/username/projects/myproject/b/tsconfig.json
 Info 36   [00:01:25.000] Scheduled: *ensureProjectForOpenFiles*
 Info 37   [00:01:26.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/extended/alpha.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/a/tsconfig.json
+2: /user/username/projects/myproject/b/tsconfig.json
+3: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/extended/alpha.tsconfig.json]
 {"compilerOptions":{"strict":true}}
 
@@ -193,13 +196,15 @@ Info 57   [00:02:04.000] 	FileName: /user/username/projects/myproject/a/a.ts Pro
 Info 57   [00:02:05.000] 		Projects: /user/username/projects/myproject/a/tsconfig.json
 Info 57   [00:02:06.000] 	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
 Info 57   [00:02:07.000] 		Projects: /user/username/projects/myproject/b/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 Info 57   [00:02:11.000] FileWatcher:: Triggered with /user/username/projects/myproject/extended/bravo.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
 Info 58   [00:02:12.000] Scheduled: /user/username/projects/myproject/b/tsconfig.json
 Info 59   [00:02:13.000] Scheduled: *ensureProjectForOpenFiles*
 Info 60   [00:02:14.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/extended/bravo.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+4: /user/username/projects/myproject/b/tsconfig.json
+5: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/extended/bravo.tsconfig.json]
 {"extends":"./alpha.tsconfig.json","compilerOptions":{"strict":false}}
 
@@ -251,13 +256,15 @@ Info 72   [00:02:44.000] 	FileName: /user/username/projects/myproject/a/a.ts Pro
 Info 72   [00:02:45.000] 		Projects: /user/username/projects/myproject/a/tsconfig.json
 Info 72   [00:02:46.000] 	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
 Info 72   [00:02:47.000] 		Projects: /user/username/projects/myproject/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 72   [00:02:51.000] FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Config file
 Info 73   [00:02:52.000] Scheduled: /user/username/projects/myproject/b/tsconfig.json
 Info 74   [00:02:53.000] Scheduled: *ensureProjectForOpenFiles*
 Info 75   [00:02:54.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+6: /user/username/projects/myproject/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/b/tsconfig.json]
 {"extends":"../extended/alpha.tsconfig.json"}
 
@@ -312,7 +319,7 @@ Info 90   [00:03:27.000] 	FileName: /user/username/projects/myproject/a/a.ts Pro
 Info 90   [00:03:28.000] 		Projects: /user/username/projects/myproject/a/tsconfig.json
 Info 90   [00:03:29.000] 	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
 Info 90   [00:03:30.000] 		Projects: /user/username/projects/myproject/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
@@ -345,7 +352,10 @@ Info 91   [00:03:35.000] Scheduled: /user/username/projects/myproject/a/tsconfig
 Info 92   [00:03:36.000] Scheduled: /user/username/projects/myproject/b/tsconfig.json
 Info 93   [00:03:37.000] Scheduled: *ensureProjectForOpenFiles*
 Info 94   [00:03:38.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/extended/alpha.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+8: /user/username/projects/myproject/a/tsconfig.json
+9: /user/username/projects/myproject/b/tsconfig.json
+10: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/extended/alpha.tsconfig.json]
 {}
 
@@ -413,4 +423,4 @@ Info 114  [00:04:16.000] 	FileName: /user/username/projects/myproject/a/a.ts Pro
 Info 114  [00:04:17.000] 		Projects: /user/username/projects/myproject/a/tsconfig.json
 Info 114  [00:04:18.000] 	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
 Info 114  [00:04:19.000] 		Projects: /user/username/projects/myproject/b/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/configuredProjects/when-multiple-projects-are-open-detects-correct-default-project.js b/tests/baselines/reference/tsserver/configuredProjects/when-multiple-projects-are-open-detects-correct-default-project.js
index ba3605d5334e0..1ad0b80c32a36 100644
--- a/tests/baselines/reference/tsserver/configuredProjects/when-multiple-projects-are-open-detects-correct-default-project.js
+++ b/tests/baselines/reference/tsserver/configuredProjects/when-multiple-projects-are-open-detects-correct-default-project.js
@@ -251,40 +251,48 @@ Info 48   [00:01:40.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 49   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/bar/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 50   [00:01:42.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/bar/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 51   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/bar/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 52   [00:01:44.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/foo/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 53   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/foo/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 54   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/foo/index.ts","diagnostics":[]}}
 Info 55   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js b/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js
index 9ae6bfabebe13..1d31c5b88469d 100644
--- a/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js
+++ b/tests/baselines/reference/tsserver/dynamicFiles/opening-untitled-files.js
@@ -45,7 +45,8 @@ Info 11   [00:00:33.000] Open files:
 Info 11   [00:00:34.000] 	FileName: untitled:^Untitled-1 ProjectRootPath: /user/username/projects/myproject
 Info 11   [00:00:35.000] 		Projects: /dev/null/inferredProject1*
 /user/username/projects/myproject/untitled:^Untitled-1 isDynamic:: true
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/Untitled-1.ts]
 const x = 10;
 
diff --git a/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js b/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js
index 00dfa16db4b28..fb7491c9cfa0f 100644
--- a/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js
+++ b/tests/baselines/reference/tsserver/events/projectLanguageServiceState/language-service-disabled-events-are-triggered.js
@@ -93,7 +93,9 @@ Info 23   [00:00:43.000] FileWatcher:: Triggered with /a/jsconfig.json 1:: Watch
 Info 24   [00:00:44.000] Scheduled: /a/jsconfig.json
 Info 25   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 26   [00:00:46.000] Elapsed:: *ms FileWatcher:: Triggered with /a/jsconfig.json 1:: WatchInfo: /a/jsconfig.json 2000 undefined Project: /a/jsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/jsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/jsconfig.json]
 {"exclude":["largefile.js"]}
 
@@ -225,7 +227,9 @@ Info 61   [00:01:56.000] Finishing updateGraphWorker: Project: /a/jsconfig.json
 Info 62   [00:01:57.000] Same program as before
 Info 63   [00:01:58.000] event:
     {"seq":0,"type":"event","event":"configFileDiag","body":{"triggerFile":"/a/jsconfig.json","configFile":"/a/jsconfig.json","diagnostics":[{"text":"File '/a/lib/lib.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'es5'","code":6053,"category":"error"},{"text":"Cannot find global type 'Array'.","code":2318,"category":"error"},{"text":"Cannot find global type 'Boolean'.","code":2318,"category":"error"},{"text":"Cannot find global type 'Function'.","code":2318,"category":"error"},{"text":"Cannot find global type 'IArguments'.","code":2318,"category":"error"},{"text":"Cannot find global type 'Number'.","code":2318,"category":"error"},{"text":"Cannot find global type 'Object'.","code":2318,"category":"error"},{"text":"Cannot find global type 'RegExp'.","code":2318,"category":"error"},{"text":"Cannot find global type 'String'.","code":2318,"category":"error"}]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 2
+7: /a/jsconfig.json
+8: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-default-event-handler.js b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-default-event-handler.js
index 9f0df4b399466..7bf648c87bd77 100644
--- a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-default-event-handler.js
+++ b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-default-event-handler.js
@@ -109,7 +109,9 @@ Info 23   [00:00:59.000] FileWatcher:: Triggered with /user/username/projects/a/
 Info 24   [00:01:00.000] Scheduled: /user/username/projects/b/tsconfig.json
 Info 25   [00:01:01.000] Scheduled: *ensureProjectForOpenFiles*
 Info 26   [00:01:02.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/a/tsconfig.json 1:: WatchInfo: /user/username/projects/a/tsconfig.json 2000 undefined Config: /user/username/projects/b/tsconfig.json WatchType: Extended config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/a/tsconfig.json] file written with same contents
 
 Info 27   [00:01:03.000] Running: /user/username/projects/b/tsconfig.json
@@ -151,4 +153,5 @@ Info 39   [00:01:26.000] 		Projects: /user/username/projects/b/tsconfig.json
 Info 39   [00:01:27.000] got projects updated in background, updating diagnostics for /user/username/projects/b/b.ts
 Info 40   [00:01:28.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/b/b.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 1
+3: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-event-handler.js b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-event-handler.js
index cdcaa5bc0c868..2b8237bfce7c2 100644
--- a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-event-handler.js
+++ b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-an-extended-config-file-when-using-event-handler.js
@@ -109,7 +109,9 @@ Info 23   [00:00:59.000] FileWatcher:: Triggered with /user/username/projects/a/
 Info 24   [00:01:00.000] Scheduled: /user/username/projects/b/tsconfig.json
 Info 25   [00:01:01.000] Scheduled: *ensureProjectForOpenFiles*
 Info 26   [00:01:02.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/a/tsconfig.json 1:: WatchInfo: /user/username/projects/a/tsconfig.json 2000 undefined Config: /user/username/projects/b/tsconfig.json WatchType: Extended config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/a/tsconfig.json] file written with same contents
 
 Info 27   [00:01:03.000] Running: /user/username/projects/b/tsconfig.json
@@ -150,4 +152,4 @@ Info 39   [00:01:25.000] 	FileName: /user/username/projects/b/b.ts ProjectRootPa
 Info 39   [00:01:26.000] 		Projects: /user/username/projects/b/tsconfig.json
 Info 39   [00:01:27.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/b/b.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-default-event-handler.js b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-default-event-handler.js
index a7b1a3a06a749..c2dd0f45e86e8 100644
--- a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-default-event-handler.js
+++ b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-default-event-handler.js
@@ -100,7 +100,9 @@ Info 22   [00:00:52.000] FileWatcher:: Triggered with /user/username/projects/a/
 Info 23   [00:00:53.000] Scheduled: /user/username/projects/a/tsconfig.json
 Info 24   [00:00:54.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:55.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/a/tsconfig.json 1:: WatchInfo: /user/username/projects/a/tsconfig.json 2000 undefined Project: /user/username/projects/a/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/a/tsconfig.json] file written with same contents
 
 Info 26   [00:00:56.000] Running: /user/username/projects/a/tsconfig.json
@@ -142,4 +144,5 @@ Info 38   [00:01:19.000] 		Projects: /user/username/projects/a/tsconfig.json
 Info 38   [00:01:20.000] got projects updated in background, updating diagnostics for /user/username/projects/a/a.ts
 Info 39   [00:01:21.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/a/a.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 1
+3: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-event-handler.js b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-event-handler.js
index b308a92dff533..aa1f46021ae90 100644
--- a/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-event-handler.js
+++ b/tests/baselines/reference/tsserver/events/projectLoading/change-is-detected-in-the-config-file-when-using-event-handler.js
@@ -100,7 +100,9 @@ Info 22   [00:00:52.000] FileWatcher:: Triggered with /user/username/projects/a/
 Info 23   [00:00:53.000] Scheduled: /user/username/projects/a/tsconfig.json
 Info 24   [00:00:54.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:55.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/a/tsconfig.json 1:: WatchInfo: /user/username/projects/a/tsconfig.json 2000 undefined Project: /user/username/projects/a/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/a/tsconfig.json] file written with same contents
 
 Info 26   [00:00:56.000] Running: /user/username/projects/a/tsconfig.json
@@ -141,4 +143,4 @@ Info 38   [00:01:18.000] 	FileName: /user/username/projects/a/a.ts ProjectRootPa
 Info 38   [00:01:19.000] 		Projects: /user/username/projects/a/tsconfig.json
 Info 38   [00:01:20.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/a/a.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js
index 7b870badaafc8..12344d220278d 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js
@@ -111,7 +111,9 @@ Info 23   [00:00:51.000] FileWatcher:: Triggered with /a/b/project/file3.ts 1::
 Info 24   [00:00:52.000] Scheduled: /a/b/project/tsconfig.json
 Info 25   [00:00:53.000] Scheduled: *ensureProjectForOpenFiles*
 Info 26   [00:00:54.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/project/file3.ts]
 export class c { }export class d {}
 
@@ -145,15 +147,15 @@ Info 36   [00:01:14.000] 	FileName: /a/b/project/file1.ts ProjectRootPath: undef
 Info 36   [00:01:15.000] 		Projects: /a/b/project/tsconfig.json
 Info 36   [00:01:16.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/project/file1.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/a/b/node_modules/file2.d.ts]
 export class a { }
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
index 0066376b59b36..1a1084f51ee93 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
@@ -123,7 +123,9 @@ Info 29   [00:01:07.000] FileWatcher:: Triggered with /user/username/rootfolder/
 Info 30   [00:01:08.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 31   [00:01:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 32   [00:01:10.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/rootfolder/otherfolder/a/b/project/file3.ts]
 export class c { }export class d {}
 
@@ -157,7 +159,7 @@ Info 42   [00:01:30.000] 	FileName: /user/username/rootfolder/otherfolder/a/b/pr
 Info 42   [00:01:31.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 42   [00:01:32.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 43   [00:01:36.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 44   [00:01:37.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
@@ -168,7 +170,8 @@ Info 48   [00:01:41.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 49   [00:01:44.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 50   [00:01:45.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info 51   [00:01:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+5: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts]
 export class a { }
 
@@ -202,9 +205,13 @@ FsWatchesRecursive::
 Info 52   [00:01:47.000] Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 Info 53   [00:01:48.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 54   [00:01:49.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+6: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+7: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+6: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+7: *ensureProjectForOpenFiles*
 
 Info 55   [00:01:50.000] Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 56   [00:01:51.000] Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
@@ -252,7 +259,7 @@ Info 70   [00:02:15.000] 	FileName: /user/username/rootfolder/otherfolder/a/b/pr
 Info 70   [00:02:16.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 70   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/rootfolder/otherfolder/a/b/project/node_modules:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
index cfc70ae449e5e..7229f7731e679 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
@@ -122,7 +122,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -172,9 +175,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -236,7 +243,7 @@ Info 80   [00:02:04.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index ef3e46080dd48..ce063f2a288f7 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -119,7 +119,10 @@ Info 53   [00:01:23.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 54   [00:01:24.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 55   [00:01:25.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 56   [00:01:26.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -167,9 +170,13 @@ FsWatchesRecursive::
 Info 57   [00:01:28.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 58   [00:01:29.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 59   [00:01:30.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -229,7 +236,7 @@ Info 76   [00:02:00.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 76   [00:02:01.000] 		Projects: /a/b/tsconfig.json
 Info 76   [00:02:02.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js
index 63642f539ded6..56862308dfb62 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-deleted-files.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 62   [00:01:37.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer2.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 63   [00:01:38.000] Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
@@ -180,7 +185,10 @@ Info 65   [00:01:40.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer2.t
 Info 66   [00:01:41.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 67   [00:01:42.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 68   [00:01:43.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file1Consumer2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: /a/b/tsconfig.jsonFailedLookupInvalidation
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -239,7 +247,7 @@ Info 87   [00:02:12.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 87   [00:02:13.000] 		Projects: /a/b/tsconfig.json
 Info 87   [00:02:14.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js
index adb9d3db7f6f2..7534f0abeb96f 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-newly-created-files.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 62   [00:01:38.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer3.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 63   [00:01:39.000] Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
@@ -180,7 +185,10 @@ Info 65   [00:01:41.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer3.t
 Info 66   [00:01:42.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 67   [00:01:43.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 68   [00:01:44.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file1Consumer3.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: /a/b/tsconfig.jsonFailedLookupInvalidation
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -251,7 +259,7 @@ Info 89   [00:02:15.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 89   [00:02:16.000] 		Projects: /a/b/tsconfig.json
 Info 89   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js
index 07b66acdf1d7b..7ae940f2e083d 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-be-up-to-date-with-the-reference-map-changes.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Before request
 
@@ -195,7 +200,9 @@ Info 63   [00:01:34.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 64   [00:01:35.000] Running: /a/b/tsconfig.json
 Info 65   [00:01:36.000] FileWatcher:: Added:: WatchInfo: /a/b/file1Consumer2.ts 500 undefined WatchType: Closed Script info
@@ -249,7 +256,7 @@ Info 78   [00:01:59.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 78   [00:02:00.000] 		Projects: /a/b/tsconfig.json
 Info 78   [00:02:01.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/modulefile1:
@@ -281,7 +288,9 @@ Info 79   [00:02:05.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 80   [00:02:06.000] Scheduled: /a/b/tsconfig.json
 Info 81   [00:02:07.000] Scheduled: *ensureProjectForOpenFiles*
 Info 82   [00:02:08.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+17: /a/b/tsconfig.json
+18: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -318,7 +327,7 @@ Info 92   [00:02:28.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 92   [00:02:29.000] 		Projects: /a/b/tsconfig.json
 Info 92   [00:02:30.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -342,15 +351,17 @@ Info 94   [00:02:32.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 95   [00:02:36.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
 Info 96   [00:02:37.000] Scheduled: /a/b/tsconfig.json
 Info 97   [00:02:38.000] Scheduled: *ensureProjectForOpenFiles*
 Info 98   [00:02:39.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+19: /a/b/tsconfig.json
+20: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export var T2: string;export function Foo() { };
 
@@ -391,7 +402,7 @@ Info 112  [00:03:03.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 112  [00:03:04.000] 		Projects: /a/b/tsconfig.json
 Info 112  [00:03:05.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -449,7 +460,9 @@ Info 115  [00:03:11.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 116  [00:03:12.000] Scheduled: /a/b/tsconfig.json
 Info 117  [00:03:13.000] Scheduled: *ensureProjectForOpenFiles*
 Info 118  [00:03:14.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+21: /a/b/tsconfig.json
+22: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -486,4 +499,4 @@ Info 128  [00:03:34.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 128  [00:03:35.000] 		Projects: /a/b/tsconfig.json
 Info 128  [00:03:36.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js
index 67f9a594aaf69..4bdd1e045c78d 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-contains-only-itself.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,9 +174,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -235,7 +242,7 @@ Info 80   [00:02:04.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -271,7 +278,9 @@ Info 81   [00:02:10.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 82   [00:02:11.000] Scheduled: /a/b/tsconfig.json
 Info 83   [00:02:12.000] Scheduled: *ensureProjectForOpenFiles*
 Info 84   [00:02:13.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+17: /a/b/tsconfig.json
+18: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { console.log('hi'); };
 
@@ -308,4 +317,4 @@ Info 94   [00:02:33.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 94   [00:02:34.000] 		Projects: /a/b/tsconfig.json
 Info 94   [00:02:35.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js
index b6af81bbf69a8..697e229f751ad 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-changes-in-non-root-files.js
@@ -99,7 +99,10 @@ Info 37   [00:01:07.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 38   [00:01:08.000] Scheduled: /a/b/tsconfig.json
 Info 39   [00:01:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:10.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+4: /a/b/tsconfig.jsonFailedLookupInvalidation
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -145,9 +148,13 @@ FsWatches::
 Info 41   [00:01:12.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 42   [00:01:13.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 43   [00:01:14.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -195,7 +202,7 @@ Info 59   [00:01:43.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 59   [00:01:44.000] 		Projects: /a/b/tsconfig.json
 Info 59   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -221,7 +228,9 @@ Info 60   [00:01:49.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 61   [00:01:50.000] Scheduled: /a/b/tsconfig.json
 Info 62   [00:01:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 63   [00:01:52.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+9: /a/b/tsconfig.json
+10: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };var T1: number;
 
@@ -255,4 +264,4 @@ Info 73   [00:02:12.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 73   [00:02:13.000] 		Projects: /a/b/tsconfig.json
 Info 73   [00:02:14.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js
index be8df6badacbd..02373a6ca5cb9 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-non-existing-code-file.js
@@ -143,7 +143,9 @@ Info 29   [00:00:52.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
 Info 30   [00:00:53.000] Running: /a/b/tsconfig.json
 Info 31   [00:00:54.000] Starting updateGraphWorker: Project: /a/b/tsconfig.json
@@ -180,7 +182,7 @@ Info 40   [00:01:13.000] 	FileName: /a/b/referenceFile1.ts ProjectRootPath: unde
 Info 40   [00:01:14.000] 		Projects: /a/b/tsconfig.json
 Info 40   [00:01:15.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/modulefile2.ts:
@@ -207,7 +209,9 @@ Info 46   [00:01:23.000] DirectoryWatcher:: Triggered with /a/b/moduleFile2.ts :
 Info 47   [00:01:24.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 48   [00:01:25.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 49   [00:01:26.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile2.ts]
 export var Foo4 = 10;
 
@@ -269,7 +273,7 @@ Info 60   [00:01:47.000] 	FileName: /a/b/referenceFile1.ts ProjectRootPath: unde
 Info 60   [00:01:48.000] 		Projects: /a/b/tsconfig.json
 Info 60   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js
index 686bdb9a304a4..d5130884e69a7 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-detect-removed-code-file.js
@@ -103,7 +103,9 @@ Info 37   [00:01:03.000] DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :
 Info 38   [00:01:04.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 39   [00:01:05.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 40   [00:01:06.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -172,7 +174,7 @@ Info 52   [00:01:28.000] 	FileName: /a/b/referenceFile1.ts ProjectRootPath: unde
 Info 52   [00:01:29.000] 		Projects: /a/b/tsconfig.json
 Info 52   [00:01:30.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js
index e72aef98c0cb4..a569d6f27e821 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-all-files-if-a-global-file-changed-shape.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,9 +174,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/globalFile3.ts]
 interface GlobalFoo { age: number }var T2: string;
 
@@ -235,7 +242,7 @@ Info 80   [00:02:04.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js
index 846fa0387c4a3..b9ffe3cd15680 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-return-cascaded-affected-file-list.js
@@ -128,7 +128,10 @@ Info 62   [00:01:34.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 63   [00:01:35.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 64   [00:01:36.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 65   [00:01:37.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+13: /a/b/tsconfig.jsonFailedLookupInvalidation
+16: /a/b/tsconfig.json
+17: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -181,7 +184,9 @@ FsWatchesRecursive::
 Info 66   [00:01:39.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 67   [00:01:40.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 68   [00:01:41.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
 Before request
 
@@ -205,7 +210,9 @@ Info 70   [00:01:43.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
 Info 71   [00:01:44.000] Running: /a/b/tsconfig.json
 Info 72   [00:01:45.000] FileWatcher:: Added:: WatchInfo: /a/b/file1Consumer1Consumer1.ts 500 undefined WatchType: Closed Script info
@@ -269,7 +276,7 @@ Info 90   [00:02:13.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 90   [00:02:14.000] 		Projects: /a/b/tsconfig.json
 Info 90   [00:02:15.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -307,7 +314,9 @@ Info 91   [00:02:19.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 92   [00:02:20.000] Scheduled: /a/b/tsconfig.json
 Info 93   [00:02:21.000] Scheduled: *ensureProjectForOpenFiles*
 Info 94   [00:02:22.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+20: /a/b/tsconfig.json
+21: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -345,7 +354,7 @@ Info 104  [00:02:42.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 104  [00:02:43.000] 		Projects: /a/b/tsconfig.json
 Info 104  [00:02:44.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -373,7 +382,9 @@ Info 107  [00:02:50.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 108  [00:02:51.000] Scheduled: /a/b/tsconfig.json
 Info 109  [00:02:52.000] Scheduled: *ensureProjectForOpenFiles*
 Info 110  [00:02:53.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+22: /a/b/tsconfig.json
+23: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T2: number;export function Foo() { };
 
@@ -411,4 +422,4 @@ Info 120  [00:03:13.000] 	FileName: /a/b/file1Consumer1.ts ProjectRootPath: unde
 Info 120  [00:03:14.000] 		Projects: /a/b/tsconfig.json
 Info 120  [00:03:15.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-work-fine-for-files-with-circular-references.js
index ce1e70fd4761e..53dc7107cfb19 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-should-work-fine-for-files-with-circular-references.js
@@ -99,7 +99,9 @@ Info 33   [00:00:57.000] DirectoryWatcher:: Triggered with /a/b/file2.ts :: Watc
 Info 34   [00:00:58.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 35   [00:00:59.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 36   [00:01:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -178,7 +180,7 @@ Info 48   [00:01:26.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 48   [00:01:27.000] 		Projects: /a/b/tsconfig.json
 Info 48   [00:01:28.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---out-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---out-is-set.js
index 724c28c599e08..006368fc7184b 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---out-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---out-is-set.js
@@ -102,7 +102,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -145,7 +147,7 @@ Info 36   [00:01:07.000] 	FileName: /a/a.ts ProjectRootPath: undefined
 Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/node_modules/@types:
@@ -167,7 +169,9 @@ Info 37   [00:01:13.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 38   [00:01:14.000] Scheduled: /a/tsconfig.json
 Info 39   [00:01:15.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:16.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -201,4 +205,4 @@ Info 50   [00:01:36.000] 	FileName: /a/a.ts ProjectRootPath: undefined
 Info 50   [00:01:37.000] 		Projects: /a/tsconfig.json
 Info 50   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js
index 3f7d24e7a75c0..c527ce9d3b3c1 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when---outFile-is-set.js
@@ -102,7 +102,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -145,7 +147,7 @@ Info 36   [00:01:07.000] 	FileName: /a/a.ts ProjectRootPath: undefined
 Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/node_modules/@types:
@@ -167,7 +169,9 @@ Info 37   [00:01:13.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 38   [00:01:14.000] Scheduled: /a/tsconfig.json
 Info 39   [00:01:15.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:16.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -201,4 +205,4 @@ Info 50   [00:01:36.000] 	FileName: /a/a.ts ProjectRootPath: undefined
 Info 50   [00:01:37.000] 		Projects: /a/tsconfig.json
 Info 50   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-adding-new-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-adding-new-file.js
index 7d13a8b4a6809..47a117afd0f07 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-adding-new-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-adding-new-file.js
@@ -100,7 +100,9 @@ Info 22   [00:00:45.000] DirectoryWatcher:: Triggered with /a/b/file2.ts :: Watc
 Info 23   [00:00:46.000] Scheduled: /a/b/tsconfig.json
 Info 24   [00:00:47.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:48.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/file2.ts]
 export var y = 10;
 
@@ -143,7 +145,7 @@ Info 36   [00:01:09.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 36   [00:01:10.000] 		Projects: /a/b/tsconfig.json
 Info 36   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -165,7 +167,9 @@ Info 37   [00:01:14.000] DirectoryWatcher:: Triggered with /a/b/file3.ts :: Watc
 Info 38   [00:01:15.000] Scheduled: /a/b/tsconfig.json
 Info 39   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:17.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file3.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/b/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b/file3.ts]
 export var z = 10;
 
@@ -211,7 +215,7 @@ Info 51   [00:01:38.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 51   [00:01:39.000] 		Projects: /a/b/tsconfig.json
 Info 51   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-both-options-are-not-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-both-options-are-not-set.js
index b432f5c6b426b..c1792af0dc3e7 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-both-options-are-not-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-when-both-options-are-not-set.js
@@ -101,7 +101,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -144,7 +146,7 @@ Info 36   [00:01:07.000] 	FileName: /a/a.ts ProjectRootPath: undefined
 Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/node_modules/@types:
@@ -166,7 +168,9 @@ Info 37   [00:01:13.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 38   [00:01:14.000] Scheduled: /a/tsconfig.json
 Info 39   [00:01:15.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:16.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -200,4 +204,4 @@ Info 50   [00:01:36.000] 	FileName: /a/a.ts ProjectRootPath: undefined
 Info 50   [00:01:37.000] 		Projects: /a/tsconfig.json
 Info 50   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"CustomHandler::projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
index 00188a3aba126..daa439f937ca6 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
@@ -111,7 +111,9 @@ Info 23   [00:00:51.000] FileWatcher:: Triggered with /a/b/project/file3.ts 1::
 Info 24   [00:00:52.000] Scheduled: /a/b/project/tsconfig.json
 Info 25   [00:00:53.000] Scheduled: *ensureProjectForOpenFiles*
 Info 26   [00:00:54.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/project/file3.ts]
 export class c { }export class d {}
 
@@ -146,15 +148,15 @@ Info 36   [00:01:15.000] 		Projects: /a/b/project/tsconfig.json
 Info 36   [00:01:16.000] got projects updated in background, updating diagnostics for /a/b/project/file1.ts
 Info 37   [00:01:17.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/project/file1.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/a/b/node_modules/file2.d.ts]
 export class a { }
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
index ee6721c660a97..d6092c952dbdd 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
@@ -123,7 +123,9 @@ Info 29   [00:01:07.000] FileWatcher:: Triggered with /user/username/rootfolder/
 Info 30   [00:01:08.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 31   [00:01:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 32   [00:01:10.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/rootfolder/otherfolder/a/b/project/file3.ts]
 export class c { }export class d {}
 
@@ -158,7 +160,7 @@ Info 42   [00:01:31.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/p
 Info 42   [00:01:32.000] got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
 Info 43   [00:01:33.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 44   [00:01:37.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 45   [00:01:38.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
@@ -169,7 +171,8 @@ Info 49   [00:01:42.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 50   [00:01:45.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 51   [00:01:46.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info 52   [00:01:47.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+5: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts]
 export class a { }
 
@@ -203,9 +206,13 @@ FsWatchesRecursive::
 Info 53   [00:01:48.000] Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 Info 54   [00:01:49.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 55   [00:01:50.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+6: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+7: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+6: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+7: *ensureProjectForOpenFiles*
 
 Info 56   [00:01:51.000] Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 57   [00:01:52.000] Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
@@ -254,7 +261,7 @@ Info 71   [00:02:17.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/p
 Info 71   [00:02:18.000] got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
 Info 72   [00:02:19.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/rootfolder/otherfolder/a/b/project/node_modules:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
index 7489e98a5ec1b..29d1e57961327 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
@@ -122,7 +122,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -172,9 +175,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -237,7 +244,7 @@ Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 81   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index d87c7a15e1425..0a1366364ef50 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -119,7 +119,10 @@ Info 53   [00:01:23.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 54   [00:01:24.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 55   [00:01:25.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 56   [00:01:26.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -167,9 +170,13 @@ FsWatchesRecursive::
 Info 57   [00:01:28.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 58   [00:01:29.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 59   [00:01:30.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -230,7 +237,7 @@ Info 76   [00:02:01.000] 		Projects: /a/b/tsconfig.json
 Info 76   [00:02:02.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 77   [00:02:03.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js
index d314ddbde460d..b60057690b2b6 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 62   [00:01:37.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer2.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 63   [00:01:38.000] Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
@@ -180,7 +185,10 @@ Info 65   [00:01:40.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer2.t
 Info 66   [00:01:41.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 67   [00:01:42.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 68   [00:01:43.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file1Consumer2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: /a/b/tsconfig.jsonFailedLookupInvalidation
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -240,7 +248,7 @@ Info 87   [00:02:13.000] 		Projects: /a/b/tsconfig.json
 Info 87   [00:02:14.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 88   [00:02:15.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js
index f5f33a8623cda..0d010a8136beb 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 62   [00:01:38.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer3.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 63   [00:01:39.000] Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
@@ -180,7 +185,10 @@ Info 65   [00:01:41.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer3.t
 Info 66   [00:01:42.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 67   [00:01:43.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 68   [00:01:44.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file1Consumer3.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: /a/b/tsconfig.jsonFailedLookupInvalidation
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -252,7 +260,7 @@ Info 89   [00:02:16.000] 		Projects: /a/b/tsconfig.json
 Info 89   [00:02:17.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 90   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js
index 2aa41e3bbf248..a235d55b811be 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Before request
 
@@ -195,7 +200,9 @@ Info 63   [00:01:34.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 64   [00:01:35.000] Running: /a/b/tsconfig.json
 Info 65   [00:01:36.000] FileWatcher:: Added:: WatchInfo: /a/b/file1Consumer2.ts 500 undefined WatchType: Closed Script info
@@ -250,7 +257,7 @@ Info 78   [00:02:00.000] 		Projects: /a/b/tsconfig.json
 Info 78   [00:02:01.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 79   [00:02:02.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/modulefile1:
@@ -282,7 +289,9 @@ Info 80   [00:02:06.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 81   [00:02:07.000] Scheduled: /a/b/tsconfig.json
 Info 82   [00:02:08.000] Scheduled: *ensureProjectForOpenFiles*
 Info 83   [00:02:09.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+17: /a/b/tsconfig.json
+18: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -320,7 +329,7 @@ Info 93   [00:02:30.000] 		Projects: /a/b/tsconfig.json
 Info 93   [00:02:31.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 94   [00:02:32.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -344,15 +353,17 @@ Info 96   [00:02:34.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 97   [00:02:38.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
 Info 98   [00:02:39.000] Scheduled: /a/b/tsconfig.json
 Info 99   [00:02:40.000] Scheduled: *ensureProjectForOpenFiles*
 Info 100  [00:02:41.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+19: /a/b/tsconfig.json
+20: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export var T2: string;export function Foo() { };
 
@@ -394,7 +405,7 @@ Info 114  [00:03:06.000] 		Projects: /a/b/tsconfig.json
 Info 114  [00:03:07.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 115  [00:03:08.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -452,7 +463,9 @@ Info 118  [00:03:14.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 119  [00:03:15.000] Scheduled: /a/b/tsconfig.json
 Info 120  [00:03:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 121  [00:03:17.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+21: /a/b/tsconfig.json
+22: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -490,4 +503,4 @@ Info 131  [00:03:38.000] 		Projects: /a/b/tsconfig.json
 Info 131  [00:03:39.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 132  [00:03:40.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js
index 51ceaa756e29d..6c2a5d5401a01 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,9 +174,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -236,7 +243,7 @@ Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 81   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -272,7 +279,9 @@ Info 82   [00:02:11.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 83   [00:02:12.000] Scheduled: /a/b/tsconfig.json
 Info 84   [00:02:13.000] Scheduled: *ensureProjectForOpenFiles*
 Info 85   [00:02:14.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+17: /a/b/tsconfig.json
+18: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { console.log('hi'); };
 
@@ -310,4 +319,4 @@ Info 95   [00:02:35.000] 		Projects: /a/b/tsconfig.json
 Info 95   [00:02:36.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 96   [00:02:37.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js
index 6dcf0eea077ff..931225453305c 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js
@@ -99,7 +99,10 @@ Info 37   [00:01:07.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 38   [00:01:08.000] Scheduled: /a/b/tsconfig.json
 Info 39   [00:01:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:10.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+4: /a/b/tsconfig.jsonFailedLookupInvalidation
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -145,9 +148,13 @@ FsWatches::
 Info 41   [00:01:12.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 42   [00:01:13.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 43   [00:01:14.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -196,7 +203,7 @@ Info 59   [00:01:44.000] 		Projects: /a/b/tsconfig.json
 Info 59   [00:01:45.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 60   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -222,7 +229,9 @@ Info 61   [00:01:50.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 62   [00:01:51.000] Scheduled: /a/b/tsconfig.json
 Info 63   [00:01:52.000] Scheduled: *ensureProjectForOpenFiles*
 Info 64   [00:01:53.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+9: /a/b/tsconfig.json
+10: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };var T1: number;
 
@@ -257,4 +266,4 @@ Info 74   [00:02:14.000] 		Projects: /a/b/tsconfig.json
 Info 74   [00:02:15.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 75   [00:02:16.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js
index 0a27783fed790..459ec8d381d7e 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js
@@ -143,7 +143,9 @@ Info 29   [00:00:52.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
 Info 30   [00:00:53.000] Running: /a/b/tsconfig.json
 Info 31   [00:00:54.000] Starting updateGraphWorker: Project: /a/b/tsconfig.json
@@ -181,7 +183,7 @@ Info 40   [00:01:14.000] 		Projects: /a/b/tsconfig.json
 Info 40   [00:01:15.000] got projects updated in background, updating diagnostics for /a/b/referenceFile1.ts
 Info 41   [00:01:16.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/modulefile2.ts:
@@ -208,7 +210,9 @@ Info 47   [00:01:24.000] DirectoryWatcher:: Triggered with /a/b/moduleFile2.ts :
 Info 48   [00:01:25.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 49   [00:01:26.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 50   [00:01:27.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile2.ts]
 export var Foo4 = 10;
 
@@ -271,7 +275,7 @@ Info 61   [00:01:49.000] 		Projects: /a/b/tsconfig.json
 Info 61   [00:01:50.000] got projects updated in background, updating diagnostics for /a/b/referenceFile1.ts
 Info 62   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js
index c9c25c28ed54c..01a2995c88c35 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js
@@ -103,7 +103,9 @@ Info 37   [00:01:03.000] DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :
 Info 38   [00:01:04.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 39   [00:01:05.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 40   [00:01:06.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -173,7 +175,7 @@ Info 52   [00:01:29.000] 		Projects: /a/b/tsconfig.json
 Info 52   [00:01:30.000] got projects updated in background, updating diagnostics for /a/b/referenceFile1.ts
 Info 53   [00:01:31.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js
index f6a6465e24001..15eeb81f5627f 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,9 +174,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/globalFile3.ts]
 interface GlobalFoo { age: number }var T2: string;
 
@@ -236,7 +243,7 @@ Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 81   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js
index 35387607a69d6..ef51d98756383 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js
@@ -128,7 +128,10 @@ Info 62   [00:01:34.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 63   [00:01:35.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 64   [00:01:36.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 65   [00:01:37.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+13: /a/b/tsconfig.jsonFailedLookupInvalidation
+16: /a/b/tsconfig.json
+17: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -181,7 +184,9 @@ FsWatchesRecursive::
 Info 66   [00:01:39.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 67   [00:01:40.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 68   [00:01:41.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
 Before request
 
@@ -205,7 +210,9 @@ Info 70   [00:01:43.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
 Info 71   [00:01:44.000] Running: /a/b/tsconfig.json
 Info 72   [00:01:45.000] FileWatcher:: Added:: WatchInfo: /a/b/file1Consumer1Consumer1.ts 500 undefined WatchType: Closed Script info
@@ -270,7 +277,7 @@ Info 90   [00:02:14.000] 		Projects: /a/b/tsconfig.json
 Info 90   [00:02:15.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 91   [00:02:16.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -308,7 +315,9 @@ Info 92   [00:02:20.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 93   [00:02:21.000] Scheduled: /a/b/tsconfig.json
 Info 94   [00:02:22.000] Scheduled: *ensureProjectForOpenFiles*
 Info 95   [00:02:23.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+20: /a/b/tsconfig.json
+21: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -347,7 +356,7 @@ Info 105  [00:02:44.000] 		Projects: /a/b/tsconfig.json
 Info 105  [00:02:45.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 106  [00:02:46.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -375,7 +384,9 @@ Info 109  [00:02:52.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 110  [00:02:53.000] Scheduled: /a/b/tsconfig.json
 Info 111  [00:02:54.000] Scheduled: *ensureProjectForOpenFiles*
 Info 112  [00:02:55.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+22: /a/b/tsconfig.json
+23: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T2: number;export function Foo() { };
 
@@ -414,4 +425,4 @@ Info 122  [00:03:16.000] 		Projects: /a/b/tsconfig.json
 Info 122  [00:03:17.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 123  [00:03:18.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js
index bb23b1a6a469b..a38aa0ebacc4b 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js
@@ -99,7 +99,9 @@ Info 33   [00:00:57.000] DirectoryWatcher:: Triggered with /a/b/file2.ts :: Watc
 Info 34   [00:00:58.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 35   [00:00:59.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 36   [00:01:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -179,7 +181,7 @@ Info 48   [00:01:27.000] 		Projects: /a/b/tsconfig.json
 Info 48   [00:01:28.000] got projects updated in background, updating diagnostics for /a/b/file1.ts
 Info 49   [00:01:29.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---out-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---out-is-set.js
index eb519a5efe691..a9b7ff24152bd 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---out-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---out-is-set.js
@@ -102,7 +102,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -146,7 +148,7 @@ Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 37   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/node_modules/@types:
@@ -168,7 +170,9 @@ Info 38   [00:01:14.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 39   [00:01:15.000] Scheduled: /a/tsconfig.json
 Info 40   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:17.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -203,4 +207,4 @@ Info 51   [00:01:38.000] 		Projects: /a/tsconfig.json
 Info 51   [00:01:39.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 52   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
index ece6218e58611..ec464084dc3f9 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
@@ -102,7 +102,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -146,7 +148,7 @@ Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 37   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/node_modules/@types:
@@ -168,7 +170,9 @@ Info 38   [00:01:14.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 39   [00:01:15.000] Scheduled: /a/tsconfig.json
 Info 40   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:17.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -203,4 +207,4 @@ Info 51   [00:01:38.000] 		Projects: /a/tsconfig.json
 Info 51   [00:01:39.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 52   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js
index 543f631bdb40d..ad63607de1842 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js
@@ -100,7 +100,9 @@ Info 22   [00:00:45.000] DirectoryWatcher:: Triggered with /a/b/file2.ts :: Watc
 Info 23   [00:00:46.000] Scheduled: /a/b/tsconfig.json
 Info 24   [00:00:47.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:48.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/file2.ts]
 export var y = 10;
 
@@ -144,7 +146,7 @@ Info 36   [00:01:10.000] 		Projects: /a/b/tsconfig.json
 Info 36   [00:01:11.000] got projects updated in background, updating diagnostics for /a/b/file1.ts
 Info 37   [00:01:12.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -166,7 +168,9 @@ Info 38   [00:01:15.000] DirectoryWatcher:: Triggered with /a/b/file3.ts :: Watc
 Info 39   [00:01:16.000] Scheduled: /a/b/tsconfig.json
 Info 40   [00:01:17.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:18.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file3.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/b/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b/file3.ts]
 export var z = 10;
 
@@ -213,7 +217,7 @@ Info 52   [00:01:40.000] 		Projects: /a/b/tsconfig.json
 Info 52   [00:01:41.000] got projects updated in background, updating diagnostics for /a/b/file1.ts
 Info 53   [00:01:42.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js
index 458baab5436ae..5b5a210b7b3c8 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js
@@ -101,7 +101,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -145,7 +147,7 @@ Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 37   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/node_modules/@types:
@@ -167,7 +169,9 @@ Info 38   [00:01:14.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 39   [00:01:15.000] Scheduled: /a/tsconfig.json
 Info 40   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:17.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /a/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -202,4 +206,4 @@ Info 51   [00:01:38.000] 		Projects: /a/tsconfig.json
 Info 51   [00:01:39.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 52   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
index 21b53632ffa9e..2959414dc5a28 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
@@ -111,7 +111,9 @@ Info 23   [00:00:51.000] FileWatcher:: Triggered with /a/b/project/file3.ts 1::
 Info 24   [00:00:52.000] Scheduled: /a/b/project/tsconfig.json
 Info 25   [00:00:53.000] Scheduled: *ensureProjectForOpenFiles*
 Info 26   [00:00:54.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/project/file3.ts]
 export class c { }export class d {}
 
@@ -146,17 +148,19 @@ Info 36   [00:01:15.000] 		Projects: /a/b/project/tsconfig.json
 Info 36   [00:01:16.000] got projects updated in background, updating diagnostics for /a/b/project/file1.ts
 Info 37   [00:01:17.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/project/file1.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 1
+3: checkOne
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+3: checkOne
 //// [/a/b/node_modules/file2.d.ts]
 export class a { }
 
 
 Info 38   [00:01:23.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/project/file1.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
index c62422c733395..913040b29ec38 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
@@ -123,7 +123,9 @@ Info 29   [00:01:07.000] FileWatcher:: Triggered with /user/username/rootfolder/
 Info 30   [00:01:08.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
 Info 31   [00:01:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 32   [00:01:10.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/rootfolder/otherfolder/a/b/project/file3.ts]
 export class c { }export class d {}
 
@@ -158,7 +160,8 @@ Info 42   [00:01:31.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/p
 Info 42   [00:01:32.000] got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
 Info 43   [00:01:33.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 1
+3: checkOne
 
 Info 44   [00:01:37.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 45   [00:01:38.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
@@ -169,7 +172,9 @@ Info 49   [00:01:42.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 50   [00:01:45.000] DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 51   [00:01:46.000] Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info 52   [00:01:47.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: checkOne
+6: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts]
 export class a { }
 
@@ -229,7 +234,8 @@ Info 63   [00:01:58.000] 	Files (4)
 Info 64   [00:01:59.000] -----------------------------------------------
 Info 65   [00:02:00.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/rootfolder/otherfolder/a/b/project/file1.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+7: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /user/username/rootfolder/otherfolder/a/b/project/node_modules:
@@ -255,7 +261,8 @@ FsWatchesRecursive::
 /user/username/rootfolder/otherfolder/a/b/node_modules:
   {}
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+7: *ensureProjectForOpenFiles*
 
 Info 66   [00:02:01.000] Running: *ensureProjectForOpenFiles*
 Info 67   [00:02:02.000] Before ensureProjectForOpenFiles:
@@ -277,4 +284,5 @@ Info 69   [00:02:15.000] 		Projects: /user/username/rootfolder/otherfolder/a/b/p
 Info 69   [00:02:16.000] got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
 Info 70   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+8: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
index 7489e98a5ec1b..cdba112857202 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---isolatedModules-is-specified.js
@@ -122,7 +122,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -172,9 +175,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -237,7 +244,8 @@ Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 81   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+17: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
index d87c7a15e1425..d6a76830536b4 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-always-return-the-file-itself-if---out-or---outFile-is-specified.js
@@ -119,7 +119,10 @@ Info 53   [00:01:23.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 54   [00:01:24.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 55   [00:01:25.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 56   [00:01:26.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -167,9 +170,13 @@ FsWatchesRecursive::
 Info 57   [00:01:28.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 58   [00:01:29.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 59   [00:01:30.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -230,7 +237,8 @@ Info 76   [00:02:01.000] 		Projects: /a/b/tsconfig.json
 Info 76   [00:02:02.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 77   [00:02:03.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+17: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js
index d314ddbde460d..50f1564a6a67e 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-deleted-files.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 62   [00:01:37.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer2.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 63   [00:01:38.000] Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
@@ -180,7 +185,10 @@ Info 65   [00:01:40.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer2.t
 Info 66   [00:01:41.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 67   [00:01:42.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 68   [00:01:43.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file1Consumer2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: /a/b/tsconfig.jsonFailedLookupInvalidation
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -240,7 +248,8 @@ Info 87   [00:02:13.000] 		Projects: /a/b/tsconfig.json
 Info 87   [00:02:14.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 88   [00:02:15.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+20: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js
index f5f33a8623cda..1cb0df2acec1f 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-newly-created-files.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 62   [00:01:38.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer3.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
 Info 63   [00:01:39.000] Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
@@ -180,7 +185,10 @@ Info 65   [00:01:41.000] DirectoryWatcher:: Triggered with /a/b/file1Consumer3.t
 Info 66   [00:01:42.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 67   [00:01:43.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 68   [00:01:44.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file1Consumer3.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: /a/b/tsconfig.jsonFailedLookupInvalidation
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -252,7 +260,8 @@ Info 89   [00:02:16.000] 		Projects: /a/b/tsconfig.json
 Info 89   [00:02:17.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 90   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+20: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js
index ed52454ff2376..b711cb9ed6ef1 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-be-up-to-date-with-the-reference-map-changes.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,7 +174,9 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Before request
 
@@ -195,7 +200,9 @@ Info 63   [00:01:34.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Info 64   [00:01:35.000] Running: /a/b/tsconfig.json
 Info 65   [00:01:36.000] FileWatcher:: Added:: WatchInfo: /a/b/file1Consumer2.ts 500 undefined WatchType: Closed Script info
@@ -250,7 +257,8 @@ Info 78   [00:02:00.000] 		Projects: /a/b/tsconfig.json
 Info 78   [00:02:01.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 79   [00:02:02.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+17: checkOne
 
 PolledWatches::
 /a/b/modulefile1:
@@ -282,7 +290,10 @@ Info 80   [00:02:06.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 81   [00:02:07.000] Scheduled: /a/b/tsconfig.json
 Info 82   [00:02:08.000] Scheduled: *ensureProjectForOpenFiles*
 Info 83   [00:02:09.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: checkOne
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -322,7 +333,8 @@ Info 94   [00:02:31.000] 		Projects: /a/b/tsconfig.json
 Info 94   [00:02:32.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 95   [00:02:33.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+20: checkOne
 
 Before request
 
@@ -346,15 +358,18 @@ Info 97   [00:02:35.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+20: checkOne
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 98   [00:02:39.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
 Info 99   [00:02:40.000] Scheduled: /a/b/tsconfig.json
 Info 100  [00:02:41.000] Scheduled: *ensureProjectForOpenFiles*
 Info 101  [00:02:42.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+21: /a/b/tsconfig.json
+22: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export var T2: string;export function Foo() { };
 
@@ -396,7 +411,8 @@ Info 115  [00:03:07.000] 		Projects: /a/b/tsconfig.json
 Info 115  [00:03:08.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 116  [00:03:09.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+23: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -454,7 +470,10 @@ Info 119  [00:03:15.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 120  [00:03:16.000] Scheduled: /a/b/tsconfig.json
 Info 121  [00:03:17.000] Scheduled: *ensureProjectForOpenFiles*
 Info 122  [00:03:18.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+23: checkOne
+24: /a/b/tsconfig.json
+25: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -492,4 +511,5 @@ Info 132  [00:03:39.000] 		Projects: /a/b/tsconfig.json
 Info 132  [00:03:40.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 133  [00:03:41.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+26: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js
index e8763c14e8e95..077f7bfdb9878 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-contains-only-itself.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,9 +174,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -236,7 +243,8 @@ Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 81   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+17: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -272,7 +280,10 @@ Info 82   [00:02:11.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 83   [00:02:12.000] Scheduled: /a/b/tsconfig.json
 Info 84   [00:02:13.000] Scheduled: *ensureProjectForOpenFiles*
 Info 85   [00:02:14.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+17: checkOne
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { console.log('hi'); };
 
@@ -312,4 +323,5 @@ Info 96   [00:02:36.000] 		Projects: /a/b/tsconfig.json
 Info 96   [00:02:37.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 97   [00:02:38.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+20: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js
index 9552da7ad6054..9a8fd2d0f1796 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-changes-in-non-root-files.js
@@ -99,7 +99,10 @@ Info 37   [00:01:07.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 38   [00:01:08.000] Scheduled: /a/b/tsconfig.json
 Info 39   [00:01:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:10.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+4: /a/b/tsconfig.jsonFailedLookupInvalidation
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -145,9 +148,13 @@ FsWatches::
 Info 41   [00:01:12.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 42   [00:01:13.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 43   [00:01:14.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -196,7 +203,8 @@ Info 59   [00:01:44.000] 		Projects: /a/b/tsconfig.json
 Info 59   [00:01:45.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 60   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+9: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -222,7 +230,10 @@ Info 61   [00:01:50.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 62   [00:01:51.000] Scheduled: /a/b/tsconfig.json
 Info 63   [00:01:52.000] Scheduled: *ensureProjectForOpenFiles*
 Info 64   [00:01:53.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+9: checkOne
+10: /a/b/tsconfig.json
+11: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };var T1: number;
 
@@ -259,4 +270,5 @@ Info 75   [00:02:15.000] 		Projects: /a/b/tsconfig.json
 Info 75   [00:02:16.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 76   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+12: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js
index 8c749c44934a5..cde3eba271bd4 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-non-existing-code-file.js
@@ -143,7 +143,9 @@ Info 29   [00:00:52.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
 Info 30   [00:00:53.000] Running: /a/b/tsconfig.json
 Info 31   [00:00:54.000] Starting updateGraphWorker: Project: /a/b/tsconfig.json
@@ -181,7 +183,8 @@ Info 40   [00:01:14.000] 		Projects: /a/b/tsconfig.json
 Info 40   [00:01:15.000] got projects updated in background, updating diagnostics for /a/b/referenceFile1.ts
 Info 41   [00:01:16.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+3: checkOne
 
 PolledWatches::
 /a/b/modulefile2.ts:
@@ -208,7 +211,10 @@ Info 47   [00:01:24.000] DirectoryWatcher:: Triggered with /a/b/moduleFile2.ts :
 Info 48   [00:01:25.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 49   [00:01:26.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 50   [00:01:27.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+3: checkOne
+6: /a/b/tsconfig.json
+7: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile2.ts]
 export var Foo4 = 10;
 
@@ -273,7 +279,8 @@ Info 62   [00:01:50.000] 		Projects: /a/b/tsconfig.json
 Info 62   [00:01:51.000] got projects updated in background, updating diagnostics for /a/b/referenceFile1.ts
 Info 63   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+8: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js
index c9c25c28ed54c..61bb307ca0199 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-detect-removed-code-file.js
@@ -103,7 +103,9 @@ Info 37   [00:01:03.000] DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :
 Info 38   [00:01:04.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 39   [00:01:05.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 40   [00:01:06.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /a/b/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -173,7 +175,8 @@ Info 52   [00:01:29.000] 		Projects: /a/b/tsconfig.json
 Info 52   [00:01:30.000] got projects updated in background, updating diagnostics for /a/b/referenceFile1.ts
 Info 53   [00:01:31.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/referenceFile1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+9: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js
index f6a6465e24001..7d05931dd688c 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-all-files-if-a-global-file-changed-shape.js
@@ -121,7 +121,10 @@ Info 55   [00:01:25.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 56   [00:01:26.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 57   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 58   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+10: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -171,9 +174,13 @@ FsWatchesRecursive::
 Info 59   [00:01:30.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 60   [00:01:31.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 61   [00:01:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 //// [/a/b/globalFile3.ts]
 interface GlobalFoo { age: number }var T2: string;
 
@@ -236,7 +243,8 @@ Info 80   [00:02:05.000] 		Projects: /a/b/tsconfig.json
 Info 80   [00:02:06.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 81   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+17: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js
index 2774148503708..afab9092c8062 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-return-cascaded-affected-file-list.js
@@ -128,7 +128,10 @@ Info 62   [00:01:34.000] FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 un
 Info 63   [00:01:35.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 64   [00:01:36.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 65   [00:01:37.000] Elapsed:: *ms FileWatcher:: Triggered with /a/lib/lib.d.ts 0:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+13: /a/b/tsconfig.jsonFailedLookupInvalidation
+16: /a/b/tsconfig.json
+17: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function Foo() { };
 
@@ -181,7 +184,9 @@ FsWatchesRecursive::
 Info 66   [00:01:39.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 67   [00:01:40.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 68   [00:01:41.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
 Before request
 
@@ -205,7 +210,9 @@ Info 70   [00:01:43.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+18: /a/b/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
 Info 71   [00:01:44.000] Running: /a/b/tsconfig.json
 Info 72   [00:01:45.000] FileWatcher:: Added:: WatchInfo: /a/b/file1Consumer1Consumer1.ts 500 undefined WatchType: Closed Script info
@@ -270,7 +277,8 @@ Info 90   [00:02:14.000] 		Projects: /a/b/tsconfig.json
 Info 90   [00:02:15.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 91   [00:02:16.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+20: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -308,7 +316,10 @@ Info 92   [00:02:20.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 93   [00:02:21.000] Scheduled: /a/b/tsconfig.json
 Info 94   [00:02:22.000] Scheduled: *ensureProjectForOpenFiles*
 Info 95   [00:02:23.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+20: checkOne
+21: /a/b/tsconfig.json
+22: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T: number;export function Foo() { };
 
@@ -349,7 +360,8 @@ Info 106  [00:02:45.000] 		Projects: /a/b/tsconfig.json
 Info 106  [00:02:46.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 107  [00:02:47.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+23: checkOne
 
 Before request
 
@@ -377,7 +389,10 @@ Info 110  [00:02:53.000] FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: Wa
 Info 111  [00:02:54.000] Scheduled: /a/b/tsconfig.json
 Info 112  [00:02:55.000] Scheduled: *ensureProjectForOpenFiles*
 Info 113  [00:02:56.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile1.ts 1:: WatchInfo: /a/b/moduleFile1.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+23: checkOne
+24: /a/b/tsconfig.json
+25: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export var T2: number;export function Foo() { };
 
@@ -416,4 +431,5 @@ Info 123  [00:03:17.000] 		Projects: /a/b/tsconfig.json
 Info 123  [00:03:18.000] got projects updated in background, updating diagnostics for /a/b/file1Consumer1.ts
 Info 124  [00:03:19.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1Consumer1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+26: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js
index bb23b1a6a469b..b3ab7a441bea6 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-should-work-fine-for-files-with-circular-references.js
@@ -99,7 +99,9 @@ Info 33   [00:00:57.000] DirectoryWatcher:: Triggered with /a/b/file2.ts :: Watc
 Info 34   [00:00:58.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 35   [00:00:59.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 36   [00:01:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/lib/lib.d.ts]
 /// <reference no-default-lib="true"/>
 interface Boolean {}
@@ -179,7 +181,8 @@ Info 48   [00:01:27.000] 		Projects: /a/b/tsconfig.json
 Info 48   [00:01:28.000] got projects updated in background, updating diagnostics for /a/b/file1.ts
 Info 49   [00:01:29.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+7: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---out-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---out-is-set.js
index f958783154546..5f2fe73004ab7 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---out-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---out-is-set.js
@@ -102,7 +102,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -146,7 +148,8 @@ Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 37   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+3: checkOne
 
 PolledWatches::
 /a/node_modules/@types:
@@ -168,7 +171,10 @@ Info 38   [00:01:14.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 39   [00:01:15.000] Scheduled: /a/tsconfig.json
 Info 40   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:17.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+3: checkOne
+4: /a/tsconfig.json
+5: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -205,4 +211,5 @@ Info 52   [00:01:39.000] 		Projects: /a/tsconfig.json
 Info 52   [00:01:40.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 53   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+6: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
index f68fb955bd68f..19555f91e1caf 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when---outFile-is-set.js
@@ -102,7 +102,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -146,7 +148,8 @@ Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 37   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+3: checkOne
 
 PolledWatches::
 /a/node_modules/@types:
@@ -168,7 +171,10 @@ Info 38   [00:01:14.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 39   [00:01:15.000] Scheduled: /a/tsconfig.json
 Info 40   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:17.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+3: checkOne
+4: /a/tsconfig.json
+5: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -205,4 +211,5 @@ Info 52   [00:01:39.000] 		Projects: /a/tsconfig.json
 Info 52   [00:01:40.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 53   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+6: checkOne
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js
index 74119815cc0b2..74f351263e4e0 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-adding-new-file.js
@@ -100,7 +100,9 @@ Info 22   [00:00:45.000] DirectoryWatcher:: Triggered with /a/b/file2.ts :: Watc
 Info 23   [00:00:46.000] Scheduled: /a/b/tsconfig.json
 Info 24   [00:00:47.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:48.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/file2.ts]
 export var y = 10;
 
@@ -144,7 +146,8 @@ Info 36   [00:01:10.000] 		Projects: /a/b/tsconfig.json
 Info 36   [00:01:11.000] got projects updated in background, updating diagnostics for /a/b/file1.ts
 Info 37   [00:01:12.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+3: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
@@ -166,7 +169,10 @@ Info 38   [00:01:15.000] DirectoryWatcher:: Triggered with /a/b/file3.ts :: Watc
 Info 39   [00:01:16.000] Scheduled: /a/b/tsconfig.json
 Info 40   [00:01:17.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:18.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file3.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+3: checkOne
+4: /a/b/tsconfig.json
+5: *ensureProjectForOpenFiles*
 //// [/a/b/file3.ts]
 export var z = 10;
 
@@ -215,7 +221,8 @@ Info 53   [00:01:41.000] 		Projects: /a/b/tsconfig.json
 Info 53   [00:01:42.000] got projects updated in background, updating diagnostics for /a/b/file1.ts
 Info 54   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/file1.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+6: checkOne
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js
index 8a009462156eb..33eee4cf68769 100644
--- a/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js
+++ b/tests/baselines/reference/tsserver/events/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-when-both-options-are-not-set.js
@@ -101,7 +101,9 @@ Info 22   [00:00:43.000] DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo:
 Info 23   [00:00:44.000] Scheduled: /a/tsconfig.json
 Info 24   [00:00:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:46.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b.ts :: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let y = 1
 
@@ -145,7 +147,8 @@ Info 36   [00:01:08.000] 		Projects: /a/tsconfig.json
 Info 36   [00:01:09.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 37   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+3: checkOne
 
 PolledWatches::
 /a/node_modules/@types:
@@ -167,7 +170,10 @@ Info 38   [00:01:14.000] FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/
 Info 39   [00:01:15.000] Scheduled: /a/tsconfig.json
 Info 40   [00:01:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 41   [00:01:17.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b.ts 1:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+3: checkOne
+4: /a/tsconfig.json
+5: *ensureProjectForOpenFiles*
 //// [/a/b.ts]
 export let x = 11
 
@@ -204,4 +210,5 @@ Info 52   [00:01:39.000] 		Projects: /a/tsconfig.json
 Info 52   [00:01:40.000] got projects updated in background, updating diagnostics for /a/a.ts
 Info 53   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+6: checkOne
diff --git a/tests/baselines/reference/tsserver/exportMapCache/does-not-invalidate-the-cache-when-package.json-is-changed-inconsequentially.js b/tests/baselines/reference/tsserver/exportMapCache/does-not-invalidate-the-cache-when-package.json-is-changed-inconsequentially.js
index 43bdc13a0ed2c..2811b9e967aa3 100644
--- a/tests/baselines/reference/tsserver/exportMapCache/does-not-invalidate-the-cache-when-package.json-is-changed-inconsequentially.js
+++ b/tests/baselines/reference/tsserver/exportMapCache/does-not-invalidate-the-cache-when-package.json-is-changed-inconsequentially.js
@@ -255,12 +255,12 @@ After request
 
 Info 46   [00:01:36.000] FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 250 undefined WatchType: package.json file
 Info 47   [00:01:37.000] Elapsed:: *ms FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/package.json]
 { "name": "blah", "dependencies": { "mobx": "*" } }
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 48   [00:01:38.000] AutoImportProviderProject: found 1 root files in 1 dependencies in * ms
 Info 49   [00:01:39.000] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
diff --git a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-a-file-is-opened-with-different-contents.js b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-a-file-is-opened-with-different-contents.js
index 5d96b6a3e509e..5c1099d78a0ef 100644
--- a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-a-file-is-opened-with-different-contents.js
+++ b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-a-file-is-opened-with-different-contents.js
@@ -344,9 +344,9 @@ Info 45   [00:01:08.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-files-are-deleted.js b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-files-are-deleted.js
index 6a57736844ab4..925756d5be80d 100644
--- a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-files-are-deleted.js
+++ b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-files-are-deleted.js
@@ -274,7 +274,9 @@ Info 52   [00:01:49.000] DirectoryWatcher:: Triggered with a.ts :: WatchInfo:  1
 Info 53   [00:01:50.000] Scheduled: /tsconfig.json, Cancelled earlier one
 Info 54   [00:01:51.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 55   [00:01:52.000] Elapsed:: *ms DirectoryWatcher:: Triggered with a.ts :: WatchInfo:  1 undefined Config: /tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/a.ts] deleted
 
 PolledWatches::
@@ -344,4 +346,4 @@ Info 68   [00:02:19.000] -----------------------------------------------
 Info 68   [00:02:20.000] Open files: 
 Info 68   [00:02:21.000] 	FileName: /b.ts ProjectRootPath: undefined
 Info 68   [00:02:22.000] 		Projects: /tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-new-files-are-added.js b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-new-files-are-added.js
index 4309630b03b74..cccbccf131f5b 100644
--- a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-new-files-are-added.js
+++ b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-new-files-are-added.js
@@ -261,7 +261,9 @@ Info 50   [00:01:42.000] DirectoryWatcher:: Triggered with src/a2.ts :: WatchInf
 Info 51   [00:01:43.000] Scheduled: /tsconfig.json, Cancelled earlier one
 Info 52   [00:01:44.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 53   [00:01:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with src/a2.ts :: WatchInfo:  1 undefined Config: /tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/src/a2.ts]
 export const foo = 0;
 
@@ -324,7 +326,7 @@ Info 67   [00:02:17.000] 	FileName: /a.ts ProjectRootPath: undefined
 Info 67   [00:02:18.000] 		Projects: /tsconfig.json
 Info 67   [00:02:19.000] 	FileName: /b.ts ProjectRootPath: undefined
 Info 67   [00:02:20.000] 		Projects: /tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-package.json-change-results-in-AutoImportProvider-change.js b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-package.json-change-results-in-AutoImportProvider-change.js
index 4407357ab2a90..d128f52a70d57 100644
--- a/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-package.json-change-results-in-AutoImportProvider-change.js
+++ b/tests/baselines/reference/tsserver/exportMapCache/invalidates-the-cache-when-package.json-change-results-in-AutoImportProvider-change.js
@@ -255,12 +255,12 @@ After request
 
 Info 46   [00:01:36.000] FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 250 undefined WatchType: package.json file
 Info 47   [00:01:37.000] Elapsed:: *ms FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/package.json]
 {}
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 48   [00:01:38.000] Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
 Info 49   [00:01:39.000] Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
diff --git a/tests/baselines/reference/tsserver/externalProjects/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tsserver/externalProjects/correctly-handles-changes-in-lib-section-of-config-file.js
index f8eaf49ae438e..ed6a541d85ad3 100644
--- a/tests/baselines/reference/tsserver/externalProjects/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tsserver/externalProjects/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -63,7 +63,9 @@ Info 16   [00:00:40.000] FileWatcher:: Triggered with /src/tsconfig.json 1:: Wat
 Info 17   [00:00:41.000] Scheduled: /src/tsconfig.json
 Info 18   [00:00:42.000] Scheduled: *ensureProjectForOpenFiles*
 Info 19   [00:00:43.000] Elapsed:: *ms FileWatcher:: Triggered with /src/tsconfig.json 1:: WatchInfo: /src/tsconfig.json 2000 undefined Project: /src/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /src/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/src/tsconfig.json]
 {"compilerOptions":{"module":"commonjs","target":"es5","noImplicitAny":true,"sourceMap":false,"lib":["es5","es2015.promise"]}}
 
@@ -135,7 +137,7 @@ Info 32   [00:01:04.000] -----------------------------------------------
 Info 32   [00:01:05.000] Open files: 
 Info 32   [00:01:06.000] 	FileName: /src/app.ts ProjectRootPath: undefined
 Info 32   [00:01:07.000] 		Projects: /src/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /src/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index c1a76ab07518f..a820fa9f617a0 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -129,25 +129,29 @@ Info 24   [00:00:54.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 25   [00:00:55.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 26   [00:00:56.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 27   [00:00:57.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
 Info 28   [00:00:58.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -204,7 +208,8 @@ Info 32   [00:01:02.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 33   [00:01:03.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
 Info 34   [00:01:04.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
@@ -217,18 +222,21 @@ Info 36   [00:01:06.000] 	Files (3)
 Info 37   [00:01:07.000] -----------------------------------------------
 Info 38   [00:01:08.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 39   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[{"start":{"line":1,"offset":24},"end":{"line":1,"offset":34},"text":"File name '/user/username/projects/myproject/logger.ts' differs from already included file name '/user/username/projects/myproject/Logger.ts' only in casing.\n  The file is in the program because:\n    Matched by default include pattern '**/*'\n    Imported via \"./logger\" from file '/user/username/projects/myproject/another.ts'","code":1149,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 40   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
 Info 41   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js
index b949cc4f92f3b..6b7cc68f804de 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-renaming-file-with-different-casing.js
@@ -129,25 +129,29 @@ Info 24   [00:00:54.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 25   [00:00:55.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/Logger.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 26   [00:00:56.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/Logger.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 27   [00:00:57.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/Logger.ts","diagnostics":[]}}
 Info 28   [00:00:58.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 29   [00:01:00.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/Logger.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 30   [00:01:01.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/Logger.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
@@ -357,7 +361,8 @@ Info 54   [00:01:45.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 55   [00:01:46.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
 Info 56   [00:01:47.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 3 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
@@ -370,36 +375,43 @@ Info 58   [00:01:49.000] 	Files (3)
 Info 59   [00:01:50.000] -----------------------------------------------
 Info 60   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/logger.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 61   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/logger.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 62   [00:01:53.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/logger.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 63   [00:01:54.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 64   [00:01:55.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 65   [00:01:56.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/another.ts","diagnostics":[]}}
 Info 66   [00:01:57.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":7}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js b/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js
index f119ac98aa35d..3ae3a3f71eca5 100644
--- a/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js
+++ b/tests/baselines/reference/tsserver/inconsistentErrorInEditor/should-not-error.js
@@ -129,22 +129,26 @@ Info 14   [00:00:23.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 15   [00:00:24.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"^/untitled/ts-nul-authority/Untitled-1","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 16   [00:00:25.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"^/untitled/ts-nul-authority/Untitled-1","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 17   [00:00:26.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"^/untitled/ts-nul-authority/Untitled-1","diagnostics":[{"start":{"line":9,"offset":5},"end":{"line":9,"offset":6},"text":"'x' is declared but its value is never read.","code":6133,"category":"suggestion","reportsUnnecessary":true}]}}
 Info 18   [00:00:27.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/inconsistentErrorInEditor2/should-not-error.js b/tests/baselines/reference/tsserver/inconsistentErrorInEditor2/should-not-error.js
index 6fc81ac27154a..1a8e640587cf2 100644
--- a/tests/baselines/reference/tsserver/inconsistentErrorInEditor2/should-not-error.js
+++ b/tests/baselines/reference/tsserver/inconsistentErrorInEditor2/should-not-error.js
@@ -114,22 +114,26 @@ Info 14   [00:00:23.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 15   [00:00:24.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"^/untitled/ts-nul-authority/Untitled-1","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 16   [00:00:25.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"^/untitled/ts-nul-authority/Untitled-1","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 17   [00:00:26.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"^/untitled/ts-nul-authority/Untitled-1","diagnostics":[]}}
 Info 18   [00:00:27.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/inferredProjects/Setting-compiler-options-for-inferred-projects-when-there-are-no-open-files-should-not-schedule-any-refresh.js b/tests/baselines/reference/tsserver/inferredProjects/Setting-compiler-options-for-inferred-projects-when-there-are-no-open-files-should-not-schedule-any-refresh.js
index 4b6e3df6b7ac1..59de28b162137 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/Setting-compiler-options-for-inferred-projects-when-there-are-no-open-files-should-not-schedule-any-refresh.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/Setting-compiler-options-for-inferred-projects-when-there-are-no-open-files-should-not-schedule-any-refresh.js
@@ -37,4 +37,5 @@ Info 2    [00:00:15.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js b/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js
index be38450b81267..9b9f5f35f912d 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/project-settings-for-inferred-projects.js
@@ -71,7 +71,10 @@ Info 28   [00:00:56.000] DirectoryWatcher:: Close:: WatchInfo: /a/node_modules/@
 Info 29   [00:00:57.000] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
 Info 30   [00:00:58.000] Scheduled: /dev/null/inferredProject2*
 Info 31   [00:00:59.000] Scheduled: *ensureProjectForOpenFiles*
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /dev/null/inferredProject1*
+2: /dev/null/inferredProject2*
+3: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /a/lib/lib.d.ts: *new*
@@ -144,7 +147,7 @@ Info 59   [00:01:45.000] 	FileName: /a/b/app.ts ProjectRootPath: undefined
 Info 59   [00:01:46.000] 		Projects: /dev/null/inferredProject1*
 Info 59   [00:01:47.000] 	FileName: /a/mod.ts ProjectRootPath: undefined
 Info 59   [00:01:48.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js b/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js
index 29bbcedc441b7..15e90fb2cc5f8 100644
--- a/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js
+++ b/tests/baselines/reference/tsserver/inferredProjects/should-use-only-one-inferred-project-if-useOneInferredProject-is-set.js
@@ -132,7 +132,9 @@ Info 42   [00:01:39.000] For info: /user/username/projects/myproject/a/b/main.ts
 Info 43   [00:01:40.000] Scheduled: /user/username/projects/myproject/a/b/tsconfig.json, Cancelled earlier one
 Info 44   [00:01:41.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 45   [00:01:42.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/a/b/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/b/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/a/b/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/a/b/tsconfig.json]
 {
                     "compilerOptions": {
@@ -248,7 +250,7 @@ Info 70   [00:02:29.000] 	FileName: /user/username/projects/myproject/a/c/main.t
 Info 70   [00:02:30.000] 		Projects: /dev/null/inferredProject1*
 Info 70   [00:02:31.000] 	FileName: /user/username/projects/myproject/a/d/main.ts ProjectRootPath: undefined
 Info 70   [00:02:32.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/a/tsconfig.json:
diff --git a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
index bb3844e5d1225..94130192943ab 100644
--- a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
+++ b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited-when-package-json-with-type-module-exists.js
@@ -148,7 +148,8 @@ Info 42   [00:01:18.000] Scheduled: /user/username/projects/myproject/src/tsconf
 Info 43   [00:01:19.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 44   [00:01:20.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 45   [00:01:21.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json]
 {"name":"app","version":"1.0.0"}
 
@@ -156,9 +157,13 @@ Before running timeout callbacks
 Info 46   [00:01:22.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 47   [00:01:23.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 48   [00:01:24.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+2: /user/username/projects/myproject/src/tsconfig.json
+3: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+2: /user/username/projects/myproject/src/tsconfig.json
+3: *ensureProjectForOpenFiles*
 
 Info 49   [00:01:25.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 50   [00:01:26.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -207,7 +212,8 @@ Info 75   [00:02:02.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 75   [00:02:03.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 76   [00:02:04.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+4: checkOne
 
 Before request
 
@@ -229,25 +235,29 @@ Info 78   [00:02:06.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+5: checkOne
 
 Info 79   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 80   [00:02:08.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":34},"text":"The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import(\"./fileB.mjs\")' call instead.\n  To convert this file to an ECMAScript module, change its file extension to '.mts', or add the field `\"type\": \"module\"` to '/user/username/projects/myproject/package.json'.","code":1479,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 81   [00:02:09.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 82   [00:02:10.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 83   [00:02:11.000] Modify package json file to add type module
 Info 84   [00:02:15.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
@@ -255,7 +265,8 @@ Info 85   [00:02:16.000] Scheduled: /user/username/projects/myproject/src/tsconf
 Info 86   [00:02:17.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 87   [00:02:18.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 88   [00:02:19.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+6: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json]
 {"name":"app","version":"1.0.0","type":"module"}
 
@@ -263,9 +274,13 @@ Before running timeout callbacks
 Info 89   [00:02:20.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 90   [00:02:21.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 91   [00:02:22.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+7: /user/username/projects/myproject/src/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /user/username/projects/myproject/src/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
 Info 92   [00:02:23.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 93   [00:02:24.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -314,7 +329,8 @@ Info 118  [00:03:00.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 118  [00:03:01.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 119  [00:03:02.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+9: checkOne
 
 Before request
 
@@ -336,25 +352,29 @@ Info 121  [00:03:04.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+10: checkOne
 
 Info 122  [00:03:05.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 123  [00:03:06.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 124  [00:03:07.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 125  [00:03:08.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 126  [00:03:09.000] Delete package.json
 Info 127  [00:03:11.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
@@ -363,15 +383,20 @@ Info 129  [00:03:13.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 130  [00:03:14.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 131  [00:03:15.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 132  [00:03:16.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+11: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json] deleted
 
 Info 133  [00:03:17.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 134  [00:03:18.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 135  [00:03:19.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+12: /user/username/projects/myproject/src/tsconfig.json
+13: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+12: /user/username/projects/myproject/src/tsconfig.json
+13: *ensureProjectForOpenFiles*
 
 Info 136  [00:03:20.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 137  [00:03:21.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -422,7 +447,8 @@ Info 164  [00:03:59.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 164  [00:04:00.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 165  [00:04:01.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+14: checkOne
 
 PolledWatches::
 /user/username/projects/myproject/src/package.json:
@@ -468,31 +494,36 @@ Info 167  [00:04:03.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+15: checkOne
 
 Info 168  [00:04:04.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 169  [00:04:05.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":34},"text":"The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import(\"./fileB.mjs\")' call instead.\n  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ \"type\": \"module\" }`.","code":1479,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 170  [00:04:06.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 171  [00:04:07.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 172  [00:04:08.000] Modify package json file to without type module
 Info 173  [00:04:11.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 0:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 174  [00:04:12.000] Scheduled: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 175  [00:04:13.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 0:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+16: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json]
 {"name":"app","version":"1.0.0"}
 
@@ -500,9 +531,13 @@ Before running timeout callbacks
 Info 176  [00:04:14.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 177  [00:04:15.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 178  [00:04:16.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+17: /user/username/projects/myproject/src/tsconfig.json
+18: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+17: /user/username/projects/myproject/src/tsconfig.json
+18: *ensureProjectForOpenFiles*
 
 Info 179  [00:04:17.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 180  [00:04:18.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -552,7 +587,8 @@ Info 206  [00:04:55.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 206  [00:04:56.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 207  [00:04:57.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+19: checkOne
 
 PolledWatches::
 /user/username/projects/myproject/src/package.json:
@@ -600,39 +636,48 @@ Info 209  [00:04:59.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+20: checkOne
 
 Info 210  [00:05:00.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: semanticCheck
 
 Info 211  [00:05:01.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":34},"text":"The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import(\"./fileB.mjs\")' call instead.\n  To convert this file to an ECMAScript module, change its file extension to '.mts', or add the field `\"type\": \"module\"` to '/user/username/projects/myproject/package.json'.","code":1479,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+8: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+8: suggestionCheck
 
 Info 212  [00:05:02.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 213  [00:05:03.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":5}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 214  [00:05:04.000] Delete package.json
 Info 215  [00:05:06.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 216  [00:05:07.000] Scheduled: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 217  [00:05:08.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+21: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json] deleted
 
 Info 218  [00:05:09.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 219  [00:05:10.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 220  [00:05:11.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+22: /user/username/projects/myproject/src/tsconfig.json
+23: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+22: /user/username/projects/myproject/src/tsconfig.json
+23: *ensureProjectForOpenFiles*
 
 Info 221  [00:05:12.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 222  [00:05:13.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -684,7 +729,8 @@ Info 250  [00:05:52.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 250  [00:05:53.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 251  [00:05:54.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+24: checkOne
 
 PolledWatches::
 /user/username/projects/myproject/src/package.json:
@@ -730,22 +776,26 @@ Info 253  [00:05:56.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+25: checkOne
 
 Info 254  [00:05:57.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+9: semanticCheck
 
 Info 255  [00:05:58.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":34},"text":"The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import(\"./fileB.mjs\")' call instead.\n  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ \"type\": \"module\" }`.","code":1479,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+10: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+10: suggestionCheck
 
 Info 256  [00:05:59.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 257  [00:06:00.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js
index 6ec318030ca93..255e16f2efca2 100644
--- a/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js
+++ b/tests/baselines/reference/tsserver/moduleResolution/package-json-file-is-edited.js
@@ -148,7 +148,8 @@ Info 42   [00:01:18.000] Scheduled: /user/username/projects/myproject/src/tsconf
 Info 43   [00:01:19.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 44   [00:01:20.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 45   [00:01:21.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json]
 {"name":"app","version":"1.0.0","type":"module"}
 
@@ -156,9 +157,13 @@ Before running timeout callbacks
 Info 46   [00:01:22.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 47   [00:01:23.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 48   [00:01:24.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+2: /user/username/projects/myproject/src/tsconfig.json
+3: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+2: /user/username/projects/myproject/src/tsconfig.json
+3: *ensureProjectForOpenFiles*
 
 Info 49   [00:01:25.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 50   [00:01:26.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -207,7 +212,8 @@ Info 75   [00:02:02.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 75   [00:02:03.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 76   [00:02:04.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+4: checkOne
 
 Before request
 
@@ -229,25 +235,29 @@ Info 78   [00:02:06.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+5: checkOne
 
 Info 79   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 80   [00:02:08.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 81   [00:02:09.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 82   [00:02:10.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 83   [00:02:11.000] Modify package json file to remove type module
 Info 84   [00:02:15.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
@@ -255,7 +265,8 @@ Info 85   [00:02:16.000] Scheduled: /user/username/projects/myproject/src/tsconf
 Info 86   [00:02:17.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 87   [00:02:18.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 88   [00:02:19.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 1:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+6: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json]
 {"name":"app","version":"1.0.0"}
 
@@ -263,9 +274,13 @@ Before running timeout callbacks
 Info 89   [00:02:20.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 90   [00:02:21.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 91   [00:02:22.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+7: /user/username/projects/myproject/src/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /user/username/projects/myproject/src/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
 Info 92   [00:02:23.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 93   [00:02:24.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -314,7 +329,8 @@ Info 118  [00:03:00.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 118  [00:03:01.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 119  [00:03:02.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+9: checkOne
 
 Before request
 
@@ -336,25 +352,29 @@ Info 121  [00:03:04.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+10: checkOne
 
 Info 122  [00:03:05.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 123  [00:03:06.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":34},"text":"The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import(\"./fileB.mjs\")' call instead.\n  To convert this file to an ECMAScript module, change its file extension to '.mts', or add the field `\"type\": \"module\"` to '/user/username/projects/myproject/package.json'.","code":1479,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 124  [00:03:07.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 125  [00:03:08.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 126  [00:03:09.000] Delete package.json
 Info 127  [00:03:11.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
@@ -363,15 +383,20 @@ Info 129  [00:03:13.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 130  [00:03:14.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 131  [00:03:15.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
 Info 132  [00:03:16.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+11: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json] deleted
 
 Info 133  [00:03:17.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 134  [00:03:18.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 135  [00:03:19.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+12: /user/username/projects/myproject/src/tsconfig.json
+13: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+12: /user/username/projects/myproject/src/tsconfig.json
+13: *ensureProjectForOpenFiles*
 
 Info 136  [00:03:20.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 137  [00:03:21.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -423,7 +448,8 @@ Info 165  [00:04:00.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 165  [00:04:01.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 166  [00:04:02.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+14: checkOne
 
 PolledWatches::
 /user/username/projects/myproject/src/package.json:
@@ -469,31 +495,36 @@ Info 168  [00:04:04.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+15: checkOne
 
 Info 169  [00:04:05.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 170  [00:04:06.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":34},"text":"The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import(\"./fileB.mjs\")' call instead.\n  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ \"type\": \"module\" }`.","code":1479,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 171  [00:04:07.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 172  [00:04:08.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 173  [00:04:09.000] Modify package json file to add type module
 Info 174  [00:04:12.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 0:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 175  [00:04:13.000] Scheduled: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 176  [00:04:14.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 0:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+16: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json]
 {"name":"app","version":"1.0.0","type":"module"}
 
@@ -501,9 +532,13 @@ Before running timeout callbacks
 Info 177  [00:04:15.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 178  [00:04:16.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 179  [00:04:17.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+17: /user/username/projects/myproject/src/tsconfig.json
+18: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+17: /user/username/projects/myproject/src/tsconfig.json
+18: *ensureProjectForOpenFiles*
 
 Info 180  [00:04:18.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 181  [00:04:19.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -546,7 +581,8 @@ Info 200  [00:04:49.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 200  [00:04:50.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 201  [00:04:51.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+19: checkOne
 
 PolledWatches::
 /user/username/projects/myproject/src/package.json:
@@ -594,39 +630,48 @@ Info 203  [00:04:53.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+20: checkOne
 
 Info 204  [00:04:54.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: semanticCheck
 
 Info 205  [00:04:55.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+8: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+8: suggestionCheck
 
 Info 206  [00:04:56.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 207  [00:04:57.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":5}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 208  [00:04:58.000] Delete package.json
 Info 209  [00:05:00.000] FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
 Info 210  [00:05:01.000] Scheduled: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 211  [00:05:02.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/package.json 2:: WatchInfo: /user/username/projects/myproject/package.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: File location affecting resolution
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+21: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/package.json] deleted
 
 Info 212  [00:05:03.000] Running: /user/username/projects/myproject/src/tsconfig.jsonFailedLookupInvalidation
 Info 213  [00:05:04.000] Scheduled: /user/username/projects/myproject/src/tsconfig.json
 Info 214  [00:05:05.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+22: /user/username/projects/myproject/src/tsconfig.json
+23: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+22: /user/username/projects/myproject/src/tsconfig.json
+23: *ensureProjectForOpenFiles*
 
 Info 215  [00:05:06.000] Running: /user/username/projects/myproject/src/tsconfig.json
 Info 216  [00:05:07.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
@@ -677,7 +722,8 @@ Info 243  [00:05:45.000] 		Projects: /user/username/projects/myproject/src/tscon
 Info 243  [00:05:46.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/fileA.ts
 Info 244  [00:05:47.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/fileA.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+24: checkOne
 
 PolledWatches::
 /user/username/projects/myproject/src/package.json:
@@ -723,22 +769,26 @@ Info 246  [00:05:49.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+25: checkOne
 
 Info 247  [00:05:50.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+9: semanticCheck
 
 Info 248  [00:05:51.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":34},"text":"The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import(\"./fileB.mjs\")' call instead.\n  To convert this file to an ECMAScript module, change its file extension to '.mts' or create a local package.json file with `{ \"type\": \"module\" }`.","code":1479,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+10: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+10: suggestionCheck
 
 Info 249  [00:05:52.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/fileA.ts","diagnostics":[]}}
 Info 250  [00:05:53.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/moduleSpecifierCache/does-not-invalidate-the-cache-when-new-files-are-added.js b/tests/baselines/reference/tsserver/moduleSpecifierCache/does-not-invalidate-the-cache-when-new-files-are-added.js
index 0e11c6dff4d11..0a607a65a0b33 100644
--- a/tests/baselines/reference/tsserver/moduleSpecifierCache/does-not-invalidate-the-cache-when-new-files-are-added.js
+++ b/tests/baselines/reference/tsserver/moduleSpecifierCache/does-not-invalidate-the-cache-when-new-files-are-added.js
@@ -741,7 +741,9 @@ Info 55   [00:01:57.000] DirectoryWatcher:: Triggered with /src/a2.ts :: WatchIn
 Info 56   [00:01:58.000] Scheduled: /tsconfig.json
 Info 57   [00:01:59.000] Scheduled: *ensureProjectForOpenFiles*
 Info 58   [00:02:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /src/a2.ts :: WatchInfo: /src 1 undefined Config: /tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/src/a2.ts]
 export const foo = 0;
 
@@ -811,7 +813,7 @@ Info 72   [00:02:36.000] 	FileName: /src/b.ts ProjectRootPath: undefined
 Info 72   [00:02:37.000] 		Projects: /tsconfig.json
 Info 72   [00:02:38.000] 	FileName: /src/c.ts ProjectRootPath: undefined
 Info 72   [00:02:39.000] 		Projects: /tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js
index adb14218540a2..10f1f23f00734 100644
--- a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js
+++ b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js
@@ -853,9 +853,9 @@ Info 70   [00:02:15.000] DirectoryWatcher:: Triggered with /node_modules/.stagin
 Info 71   [00:02:16.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /node_modules/.staging/mobx-12345678 :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
 Info 72   [00:02:19.000] DirectoryWatcher:: Triggered with /node_modules/.staging/mobx-12345678/package.json :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
 Info 73   [00:02:20.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /node_modules/.staging/mobx-12345678/package.json :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/node_modules/.staging/mobx-12345678/package.json]
 {}
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-local-packageJson-changes.js b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-local-packageJson-changes.js
index 4978bb17b06f6..1c8cf680a9b8b 100644
--- a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-local-packageJson-changes.js
+++ b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-local-packageJson-changes.js
@@ -739,11 +739,11 @@ After request
 
 Info 55   [00:01:58.000] FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 250 undefined WatchType: package.json file
 Info 56   [00:01:59.000] Elapsed:: *ms FileWatcher:: Triggered with /package.json 1:: WatchInfo: /package.json 250 undefined WatchType: package.json file
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/package.json]
 {}
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 57   [00:02:00.000] moduleSpecifierCache count: 0
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js
index b823747eae31a..e2e91faf8dfb0 100644
--- a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js
+++ b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-module-resolution-settings-change.js
@@ -741,7 +741,9 @@ Info 55   [00:01:58.000] FileWatcher:: Triggered with /tsconfig.json 1:: WatchIn
 Info 56   [00:01:59.000] Scheduled: /tsconfig.json
 Info 57   [00:02:00.000] Scheduled: *ensureProjectForOpenFiles*
 Info 58   [00:02:01.000] Elapsed:: *ms FileWatcher:: Triggered with /tsconfig.json 1:: WatchInfo: /tsconfig.json 2000 undefined Project: /tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/tsconfig.json]
 { "compilerOptions": { "moduleResolution": "classic" }, "include": ["src"] }
 
@@ -809,6 +811,6 @@ Info 73   [00:02:38.000] 	FileName: /src/b.ts ProjectRootPath: undefined
 Info 73   [00:02:39.000] 		Projects: /tsconfig.json
 Info 73   [00:02:40.000] 	FileName: /src/c.ts ProjectRootPath: undefined
 Info 73   [00:02:41.000] 		Projects: /tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 73   [00:02:42.000] moduleSpecifierCache count: 0
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-symlinks-are-added-or-removed.js b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-symlinks-are-added-or-removed.js
index 7da1aa6c01d3a..c412a4ad72cbb 100644
--- a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-symlinks-are-added-or-removed.js
+++ b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-the-cache-when-symlinks-are-added-or-removed.js
@@ -750,7 +750,9 @@ Info 64   [00:02:07.000] DirectoryWatcher:: Triggered with /src/b-link2.ts :: Wa
 Info 65   [00:02:08.000] Scheduled: /tsconfig.json, Cancelled earlier one
 Info 66   [00:02:09.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 67   [00:02:10.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /src/b-link2.ts :: WatchInfo: /src 1 undefined Config: /tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/src/b-link.ts] deleted symlink
 
 PolledWatches::
@@ -833,6 +835,6 @@ Info 80   [00:02:45.000] 	FileName: /src/b.ts ProjectRootPath: undefined
 Info 80   [00:02:46.000] 		Projects: /tsconfig.json
 Info 80   [00:02:47.000] 	FileName: /src/c.ts ProjectRootPath: undefined
 Info 80   [00:02:48.000] 		Projects: /tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 80   [00:02:49.000] moduleSpecifierCache count: 0
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/openfile/different-content-refreshes-sourceFile.js b/tests/baselines/reference/tsserver/openfile/different-content-refreshes-sourceFile.js
index 02ad630fcf374..06b88ff4fdd68 100644
--- a/tests/baselines/reference/tsserver/openfile/different-content-refreshes-sourceFile.js
+++ b/tests/baselines/reference/tsserver/openfile/different-content-refreshes-sourceFile.js
@@ -249,7 +249,9 @@ Info 44   [00:01:23.000] FileWatcher:: Triggered with /project/b.ts 1:: WatchInf
 Info 45   [00:01:24.000] Scheduled: /project/tsconfig.json
 Info 46   [00:01:25.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:01:26.000] Elapsed:: *ms FileWatcher:: Triggered with /project/b.ts 1:: WatchInfo: /project/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/project/b.ts]
 export const b = 10;export const x = 10;
 
@@ -281,4 +283,4 @@ Info 57   [00:01:44.000] -----------------------------------------------
 Info 57   [00:01:45.000] Open files: 
 Info 57   [00:01:46.000] 	FileName: /project/a.ts ProjectRootPath: undefined
 Info 57   [00:01:47.000] 		Projects: /project/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/openfile/does-not-refresh-sourceFile.js b/tests/baselines/reference/tsserver/openfile/does-not-refresh-sourceFile.js
index 07b8d2acf2122..981b75b08ec7e 100644
--- a/tests/baselines/reference/tsserver/openfile/does-not-refresh-sourceFile.js
+++ b/tests/baselines/reference/tsserver/openfile/does-not-refresh-sourceFile.js
@@ -233,7 +233,9 @@ Info 37   [00:01:16.000] FileWatcher:: Triggered with /project/b.ts 1:: WatchInf
 Info 38   [00:01:17.000] Scheduled: /project/tsconfig.json
 Info 39   [00:01:18.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:19.000] Elapsed:: *ms FileWatcher:: Triggered with /project/b.ts 1:: WatchInfo: /project/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/project/b.ts]
 export const b = 10;export const x = 10;
 
@@ -265,4 +267,4 @@ Info 50   [00:01:37.000] -----------------------------------------------
 Info 50   [00:01:38.000] Open files: 
 Info 50   [00:01:39.000] 	FileName: /project/a.ts ProjectRootPath: undefined
 Info 50   [00:01:40.000] 		Projects: /project/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-does-not-refresh-sourceFile-if-contents-match.js b/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-does-not-refresh-sourceFile-if-contents-match.js
index 4b94a845ed29b..ad8601f5cc8ca 100644
--- a/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-does-not-refresh-sourceFile-if-contents-match.js
+++ b/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-does-not-refresh-sourceFile-if-contents-match.js
@@ -276,7 +276,9 @@ Info 44   [00:01:25.000] FileWatcher:: Triggered with /project/b.ts 1:: WatchInf
 Info 45   [00:01:26.000] Scheduled: /project/tsconfig.json
 Info 46   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /project/b.ts 1:: WatchInfo: /project/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/project/b.ts]
 export const y = 10;export const b = 10;export const x = 10;
 
@@ -308,4 +310,4 @@ Info 57   [00:01:46.000] -----------------------------------------------
 Info 57   [00:01:47.000] Open files: 
 Info 57   [00:01:48.000] 	FileName: /project/a.ts ProjectRootPath: undefined
 Info 57   [00:01:49.000] 		Projects: /project/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-refreshes-sourceFile.js b/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-refreshes-sourceFile.js
index 98060301f8a1f..292c85863c800 100644
--- a/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-refreshes-sourceFile.js
+++ b/tests/baselines/reference/tsserver/openfile/edits-on-file-and-then-close-refreshes-sourceFile.js
@@ -279,7 +279,9 @@ Info 46   [00:01:25.000] FileWatcher:: Triggered with /project/b.ts 1:: WatchInf
 Info 47   [00:01:26.000] Scheduled: /project/tsconfig.json
 Info 48   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*
 Info 49   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /project/b.ts 1:: WatchInfo: /project/b.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /project/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/project/b.ts]
 export const b = 10;export const x = 10;
 
@@ -311,4 +313,4 @@ Info 59   [00:01:46.000] -----------------------------------------------
 Info 59   [00:01:47.000] Open files: 
 Info 59   [00:01:48.000] 	FileName: /project/a.ts ProjectRootPath: undefined
 Info 59   [00:01:49.000] 		Projects: /project/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/openfile/when-file-makes-edits-to-add/remove-comment-directives,-they-are-handled-correcrly.js b/tests/baselines/reference/tsserver/openfile/when-file-makes-edits-to-add/remove-comment-directives,-they-are-handled-correcrly.js
index d9a706092571b..f191d748d0fd6 100644
--- a/tests/baselines/reference/tsserver/openfile/when-file-makes-edits-to-add/remove-comment-directives,-they-are-handled-correcrly.js
+++ b/tests/baselines/reference/tsserver/openfile/when-file-makes-edits-to-add/remove-comment-directives,-they-are-handled-correcrly.js
@@ -105,25 +105,29 @@ Info 16   [00:00:41.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 17   [00:00:42.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 18   [00:00:43.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 19   [00:00:44.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
 Info 20   [00:00:45.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -180,7 +184,8 @@ Info 24   [00:00:49.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 25   [00:00:50.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info 26   [00:00:51.000] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -192,21 +197,24 @@ Info 28   [00:00:53.000] 	Files (2)
 Info 29   [00:00:54.000] -----------------------------------------------
 Info 30   [00:00:55.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 31   [00:00:56.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[{"start":{"line":4,"offset":9},"end":{"line":4,"offset":10},"text":"Type 'number' is not assignable to type 'string'.","code":2322,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 32   [00:00:57.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
 Info 33   [00:00:58.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -263,7 +271,8 @@ Info 37   [00:01:02.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 38   [00:01:03.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info 39   [00:01:04.000] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -275,18 +284,21 @@ Info 41   [00:01:06.000] 	Files (2)
 Info 42   [00:01:07.000] -----------------------------------------------
 Info 43   [00:01:08.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 44   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 45   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/file.ts","diagnostics":[]}}
 Info 46   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/partialSemanticServer/syntactic-diagnostics-are-returned-with-no-error.js b/tests/baselines/reference/tsserver/partialSemanticServer/syntactic-diagnostics-are-returned-with-no-error.js
index 2199be8bf1446..2da638dc36afb 100644
--- a/tests/baselines/reference/tsserver/partialSemanticServer/syntactic-diagnostics-are-returned-with-no-error.js
+++ b/tests/baselines/reference/tsserver/partialSemanticServer/syntactic-diagnostics-are-returned-with-no-error.js
@@ -127,8 +127,9 @@ Info 11   [00:00:38.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 12   [00:00:39.000] Session does not support events: ignored event: {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/a.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":18},"text":"')' expected.","code":1005,"category":"error","relatedInformation":[{"span":{"start":{"line":1,"offset":4},"end":{"line":1,"offset":5},"file":"/user/username/projects/myproject/a.ts"},"message":"The parser expected to find a ')' to match the '(' token here.","category":"error","code":1007}]}]}}
 Info 13   [00:00:40.000] Session does not support events: ignored event: {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js b/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js
index 7bb0910775fc5..a7a7e3cd0dd95 100644
--- a/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js
+++ b/tests/baselines/reference/tsserver/plugins/gets-external-files-with-config-file-reload.js
@@ -106,7 +106,9 @@ Info 22   [00:00:52.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 23   [00:00:53.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 24   [00:00:54.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:55.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/tsconfig.json]
 {"compilerOptions":{"plugins":[{"name":"some-other-plugin"}]}}
 
@@ -158,7 +160,7 @@ Info 42   [00:01:20.000] -----------------------------------------------
 Info 42   [00:01:21.000] Open files: 
 Info 42   [00:01:22.000] 	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
 Info 42   [00:01:23.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectErrors/configFileDiagnostic-events-are-generated-when-the-config-file-changes.js b/tests/baselines/reference/tsserver/projectErrors/configFileDiagnostic-events-are-generated-when-the-config-file-changes.js
index 56b443ac8a911..a04f0642d2137 100644
--- a/tests/baselines/reference/tsserver/projectErrors/configFileDiagnostic-events-are-generated-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tsserver/projectErrors/configFileDiagnostic-events-are-generated-when-the-config-file-changes.js
@@ -102,7 +102,9 @@ Info 22   [00:00:46.000] FileWatcher:: Triggered with /a/b/tsconfig.json 1:: Wat
 Info 23   [00:00:47.000] Scheduled: /a/b/tsconfig.json
 Info 24   [00:00:48.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:00:49.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json]
 {
                 "compilerOptions": {
@@ -155,13 +157,17 @@ Info 40   [00:01:15.000] 		Projects: /a/b/tsconfig.json
 Info 40   [00:01:16.000] got projects updated in background, updating diagnostics for /a/b/app.ts
 Info 41   [00:01:17.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/app.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+3: checkOne
 
 Info 42   [00:01:21.000] FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
 Info 43   [00:01:22.000] Scheduled: /a/b/tsconfig.json
 Info 44   [00:01:23.000] Scheduled: *ensureProjectForOpenFiles*
 Info 45   [00:01:24.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+3: checkOne
+4: /a/b/tsconfig.json
+5: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json]
 {
                 "compilerOptions": {}
@@ -214,4 +220,5 @@ Info 61   [00:01:51.000] 		Projects: /a/b/tsconfig.json
 Info 61   [00:01:52.000] got projects updated in background, updating diagnostics for /a/b/app.ts
 Info 62   [00:01:53.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/app.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+6: checkOne
diff --git a/tests/baselines/reference/tsserver/projectErrors/correct-errors-when-resolution-resolves-to-file-that-has-same-ambient-module-and-is-also-module.js b/tests/baselines/reference/tsserver/projectErrors/correct-errors-when-resolution-resolves-to-file-that-has-same-ambient-module-and-is-also-module.js
index a3399d5c9b12a..acdc869563989 100644
--- a/tests/baselines/reference/tsserver/projectErrors/correct-errors-when-resolution-resolves-to-file-that-has-same-ambient-module-and-is-also-module.js
+++ b/tests/baselines/reference/tsserver/projectErrors/correct-errors-when-resolution-resolves-to-file-that-has-same-ambient-module-and-is-also-module.js
@@ -122,8 +122,6 @@ FsWatchesRecursive::
 /users/username/projects/myproject/node_modules: *new*
   {}
 
-Checking timeout queue length: 0
-
 Before request
 
 Info 26   [00:01:05.000] request:
@@ -144,25 +142,29 @@ Info 27   [00:01:06.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 28   [00:01:07.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/src/a.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 29   [00:01:08.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/src/a.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 30   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/src/a.ts","diagnostics":[{"start":{"line":1,"offset":1},"end":{"line":1,"offset":44},"text":"'myModule' is declared but its value is never read.","code":6133,"category":"suggestion","reportsUnnecessary":true},{"start":{"line":2,"offset":10},"end":{"line":2,"offset":13},"text":"'foo' is declared but its value is never read.","code":6133,"category":"suggestion","reportsUnnecessary":true}]}}
 Info 31   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -186,8 +188,6 @@ Info 33   [00:01:12.000] response:
     }
 After request
 
-Checking timeout queue length: 0
-
 Before request
 
 Info 34   [00:01:13.000] request:
@@ -208,7 +208,8 @@ Info 35   [00:01:14.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 36   [00:01:15.000] Starting updateGraphWorker: Project: /users/username/projects/myproject/tsconfig.json
 Info 37   [00:01:16.000] Finishing updateGraphWorker: Project: /users/username/projects/myproject/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -222,18 +223,21 @@ Info 39   [00:01:18.000] 	Files (4)
 Info 40   [00:01:19.000] -----------------------------------------------
 Info 41   [00:01:20.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/src/a.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 42   [00:01:21.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/src/a.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 43   [00:01:22.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/src/a.ts","diagnostics":[{"start":{"line":1,"offset":1},"end":{"line":1,"offset":44},"text":"'myModule' is declared but its value is never read.","code":6133,"category":"suggestion","reportsUnnecessary":true},{"start":{"line":2,"offset":10},"end":{"line":2,"offset":13},"text":"'foo' is declared but its value is never read.","code":6133,"category":"suggestion","reportsUnnecessary":true}]}}
 Info 44   [00:01:23.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/diagnostics-after-noUnusedLabels-changes.js b/tests/baselines/reference/tsserver/projectErrors/diagnostics-after-noUnusedLabels-changes.js
index fe1c857b2607d..0739c48f6084e 100644
--- a/tests/baselines/reference/tsserver/projectErrors/diagnostics-after-noUnusedLabels-changes.js
+++ b/tests/baselines/reference/tsserver/projectErrors/diagnostics-after-noUnusedLabels-changes.js
@@ -73,7 +73,9 @@ Info 16   [00:00:31.000] FileWatcher:: Triggered with /tsconfig.json 1:: WatchIn
 Info 17   [00:00:32.000] Scheduled: /tsconfig.json
 Info 18   [00:00:33.000] Scheduled: *ensureProjectForOpenFiles*
 Info 19   [00:00:34.000] Elapsed:: *ms FileWatcher:: Triggered with /tsconfig.json 1:: WatchInfo: /tsconfig.json 2000 undefined Project: /tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/tsconfig.json]
 { "compilerOptions": { "allowUnusedLabels": false } }
 
@@ -113,7 +115,7 @@ Info 31   [00:00:54.000] -----------------------------------------------
 Info 31   [00:00:55.000] Open files: 
 Info 31   [00:00:56.000] 	FileName: /a.ts ProjectRootPath: undefined
 Info 31   [00:00:57.000] 		Projects: /tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js b/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js
index da42c207a3e74..20067bdf4aefe 100644
--- a/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js
+++ b/tests/baselines/reference/tsserver/projectErrors/folder-rename-updates-project-structure-and-reports-no-errors.js
@@ -111,25 +111,29 @@ Info 24   [00:00:51.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 25   [00:00:52.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/projects/myproject/bar/app.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 26   [00:00:53.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a/b/projects/myproject/bar/app.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 27   [00:00:54.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/a/b/projects/myproject/bar/app.ts","diagnostics":[]}}
 Info 28   [00:00:55.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 29   [00:00:57.000] DirectoryWatcher:: Triggered with /a/b/projects/myproject/foo :: WatchInfo: /a/b/projects/myproject 1 undefined Config: /a/b/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 30   [00:00:58.000] Scheduled: /a/b/projects/myproject/tsconfig.json
@@ -152,7 +156,9 @@ Info 46   [00:01:16.000] DirectoryWatcher:: Triggered with /a/b/projects/myproje
 Info 47   [00:01:17.000] Scheduled: /a/b/projects/myproject/tsconfig.json, Cancelled earlier one
 Info 48   [00:01:18.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 49   [00:01:19.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/projects/myproject/foo2/foo.ts :: WatchInfo: /a/b/projects/myproject 1 undefined Config: /a/b/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+10: /a/b/projects/myproject/tsconfig.json
+11: *ensureProjectForOpenFiles*
 //// [/a/b/projects/myproject/foo2/foo.ts]
 declare namespace foo { interface Foo { get2(): number; getFoo(): string; } }
 
@@ -212,7 +218,8 @@ Info 60   [00:01:41.000] 		Projects: /a/b/projects/myproject/tsconfig.json
 Info 60   [00:01:42.000] got projects updated in background, updating diagnostics for /a/b/projects/myproject/bar/app.ts
 Info 61   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/projects/myproject/bar/app.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+12: checkOne
 
 PolledWatches::
 /a/lib/lib.d.ts:
@@ -230,11 +237,12 @@ FsWatchesRecursive::
 /a/b/projects/myproject:
   {}
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+12: checkOne
 
 Info 62   [00:01:44.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/projects/myproject/bar/app.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -256,22 +264,26 @@ Info 64   [00:01:46.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+13: checkOne
 
 Info 65   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/projects/myproject/bar/app.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: semanticCheck
 
 Info 66   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a/b/projects/myproject/bar/app.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+5: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: suggestionCheck
 
 Info 67   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/a/b/projects/myproject/bar/app.ts","diagnostics":[]}}
 Info 68   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/getting-errors-before-opening-file.js b/tests/baselines/reference/tsserver/projectErrors/getting-errors-before-opening-file.js
index de15a11388157..7747576759916 100644
--- a/tests/baselines/reference/tsserver/projectErrors/getting-errors-before-opening-file.js
+++ b/tests/baselines/reference/tsserver/projectErrors/getting-errors-before-opening-file.js
@@ -36,8 +36,9 @@ Info 2    [00:00:17.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 3    [00:00:18.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":1}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js
index 2da6f0af38086..1ac5f02b265fc 100644
--- a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js
+++ b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js
@@ -125,25 +125,29 @@ Info 27   [00:00:56.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 28   [00:00:57.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 29   [00:00:58.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 30   [00:00:59.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 31   [00:01:00.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 32   [00:01:03.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info 33   [00:01:04.000] Scheduled: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
@@ -177,7 +181,11 @@ Info 60   [00:01:39.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 61   [00:01:40.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/core-js-db53158d :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 62   [00:01:41.000] Project: /user/username/projects/myproject/tsconfig.json Detected ignored path: /user/username/projects/myproject/node_modules/.staging/core-js-db53158d
 Info 63   [00:01:42.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/core-js-db53158d :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 3
+Timeout callback:: count: 3
+6: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+7: /user/username/projects/myproject/tsconfig.json
+8: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -221,10 +229,13 @@ Info 65   [00:01:44.000] response:
     }
 After request
 
-Checking timeout queue length: 4
-
-Before running timeout callback9
+Before running Timeout callback:: count: 4
+6: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+7: /user/username/projects/myproject/tsconfig.json
+8: *ensureProjectForOpenFiles*
+9: checkOne
 
+Invoking Timeout callback:: timeoutId:: 9:: checkOne
 Info 66   [00:01:45.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 67   [00:01:46.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
 Info 68   [00:01:47.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
@@ -236,21 +247,26 @@ Info 70   [00:01:49.000] 	Files (2)
 Info 71   [00:01:50.000] -----------------------------------------------
 Info 72   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running timeout callback9
+After running Timeout callback:: count: 2
+7: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 73   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 74   [00:01:53.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 75   [00:01:54.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 76   [00:01:57.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info 77   [00:01:58.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
@@ -287,7 +303,10 @@ Info 107  [00:02:40.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 108  [00:02:41.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 109  [00:02:42.000] Project: /user/username/projects/myproject/tsconfig.json Detected ignored path: /user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts
 Info 110  [00:02:43.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 2
+Timeout callback:: count: 2
+7: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts]
 export const x = 10;
 
@@ -315,29 +334,39 @@ Info 112  [00:02:45.000] response:
     }
 After request
 
-Checking timeout queue length: 3
-
-Before running timeout callback11
+Before running Timeout callback:: count: 3
+7: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
+11: checkOne
 
+Invoking Timeout callback:: timeoutId:: 11:: checkOne
 Info 113  [00:02:46.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running timeout callback11
+After running Timeout callback:: count: 2
+7: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 114  [00:02:47.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 115  [00:02:48.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 116  [00:02:49.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Checking timeout queue length: 2
+Timeout callback:: count: 2
+7: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/@angular/core/index.d.ts]
 export const y = 10;
 
@@ -362,27 +391,34 @@ Info 118  [00:02:57.000] response:
     }
 After request
 
-Checking timeout queue length: 3
-
-Before running timeout callback12
+Before running Timeout callback:: count: 3
+7: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
+12: checkOne
 
+Invoking Timeout callback:: timeoutId:: 12:: checkOne
 Info 119  [00:02:58.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running timeout callback12
+After running Timeout callback:: count: 2
+7: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: semanticCheck
 
 Info 120  [00:02:59.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+8: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+8: suggestionCheck
 
 Info 121  [00:03:00.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 122  [00:03:01.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":5}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 123  [00:03:03.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info 124  [00:03:04.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
@@ -441,16 +477,23 @@ Info 176  [00:04:06.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 177  [00:04:07.000] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
 Info 178  [00:04:08.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 179  [00:04:09.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+13: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+14: /user/username/projects/myproject/tsconfig.json
+15: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts] deleted
 //// [/user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts] deleted
 
 Info 180  [00:04:10.000] Running: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
 Info 181  [00:04:11.000] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
 Info 182  [00:04:12.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 2
+16: /user/username/projects/myproject/tsconfig.json
+17: *ensureProjectForOpenFiles*
 
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+16: /user/username/projects/myproject/tsconfig.json
+17: *ensureProjectForOpenFiles*
 
 Info 183  [00:04:13.000] Running: /user/username/projects/myproject/tsconfig.json
 Info 184  [00:04:14.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
@@ -492,7 +535,8 @@ Info 194  [00:04:35.000] 		Projects: /user/username/projects/myproject/tsconfig.
 Info 194  [00:04:36.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/main.ts
 Info 195  [00:04:37.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/main.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 1
+18: checkOne
 
 Before request
 
@@ -514,22 +558,26 @@ Info 197  [00:04:39.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+19: checkOne
 
 Info 198  [00:04:40.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+9: semanticCheck
 
 Info 199  [00:04:41.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+10: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+10: suggestionCheck
 
 Info 200  [00:04:42.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 201  [00:04:43.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js
index 8ad7ef8984ed4..77e6323a80bac 100644
--- a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js
+++ b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js
@@ -125,25 +125,29 @@ Info 27   [00:00:56.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 28   [00:00:57.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 29   [00:00:58.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 30   [00:00:59.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 31   [00:01:00.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 32   [00:01:03.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info 33   [00:01:04.000] Scheduled: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
@@ -177,7 +181,10 @@ Info 60   [00:01:39.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 61   [00:01:40.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/core-js-db53158d :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 62   [00:01:41.000] Project: /user/username/projects/myproject/tsconfig.json Detected ignored path: /user/username/projects/myproject/node_modules/.staging/core-js-db53158d
 Info 63   [00:01:42.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/core-js-db53158d :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+6: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+7: /user/username/projects/myproject/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -204,9 +211,13 @@ FsWatchesRecursive::
 Info 64   [00:01:43.000] Running: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
 Info 65   [00:01:44.000] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
 Info 66   [00:01:45.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 2
+9: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
 
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+9: /user/username/projects/myproject/tsconfig.json
+10: *ensureProjectForOpenFiles*
 
 Info 67   [00:01:46.000] Running: /user/username/projects/myproject/tsconfig.json
 Info 68   [00:01:47.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
@@ -237,7 +248,8 @@ Info 76   [00:02:06.000] 		Projects: /user/username/projects/myproject/tsconfig.
 Info 76   [00:02:07.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/main.ts
 Info 77   [00:02:08.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/main.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 1
+11: checkOne
 
 Before request
 
@@ -259,25 +271,29 @@ Info 79   [00:02:10.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+12: checkOne
 
 Info 80   [00:02:11.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 81   [00:02:12.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 82   [00:02:13.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 83   [00:02:14.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 84   [00:02:17.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info 85   [00:02:18.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
@@ -314,7 +330,7 @@ Info 115  [00:03:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 116  [00:03:01.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 117  [00:03:02.000] Project: /user/username/projects/myproject/tsconfig.json Detected ignored path: /user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts
 Info 118  [00:03:03.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts]
 export const x = 10;
 
@@ -322,7 +338,11 @@ export const x = 10;
 export const y = 10;
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
+
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -344,32 +364,40 @@ Info 120  [00:03:05.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+13: checkOne
 
 Info 121  [00:03:06.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 122  [00:03:07.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 123  [00:03:08.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 124  [00:03:09.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/@angular/core/index.d.ts]
 export const y = 10;
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
+
+Before running Timeout callback:: count: 0
+
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -391,25 +419,29 @@ Info 126  [00:03:17.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+14: checkOne
 
 Info 127  [00:03:18.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: semanticCheck
 
 Info 128  [00:03:19.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[{"start":{"line":1,"offset":21},"end":{"line":1,"offset":36},"text":"Cannot find module '@angular/core' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+8: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+8: suggestionCheck
 
 Info 129  [00:03:20.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 130  [00:03:21.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":5}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 131  [00:03:23.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info 132  [00:03:24.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
@@ -468,16 +500,23 @@ Info 184  [00:04:26.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 185  [00:04:27.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 186  [00:04:28.000] Scheduled: *ensureProjectForOpenFiles*
 Info 187  [00:04:29.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.staging :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+15: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
+16: /user/username/projects/myproject/tsconfig.json
+17: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/node_modules/.staging/@angular/cli-c1e44b05/models/analytics.d.ts] deleted
 //// [/user/username/projects/myproject/node_modules/.staging/@angular/core-0963aebf/index.d.ts] deleted
 
 Info 188  [00:04:30.000] Running: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
 Info 189  [00:04:31.000] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
 Info 190  [00:04:32.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 2
+18: /user/username/projects/myproject/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+18: /user/username/projects/myproject/tsconfig.json
+19: *ensureProjectForOpenFiles*
 
 Info 191  [00:04:33.000] Running: /user/username/projects/myproject/tsconfig.json
 Info 192  [00:04:34.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
@@ -519,7 +558,8 @@ Info 202  [00:04:55.000] 		Projects: /user/username/projects/myproject/tsconfig.
 Info 202  [00:04:56.000] got projects updated in background, updating diagnostics for /user/username/projects/myproject/src/main.ts
 Info 203  [00:04:57.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/projects/myproject/src/main.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 1
+20: checkOne
 
 Before request
 
@@ -541,22 +581,26 @@ Info 205  [00:04:59.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+21: checkOne
 
 Info 206  [00:05:00.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+9: semanticCheck
 
 Info 207  [00:05:01.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+10: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+10: suggestionCheck
 
 Info 208  [00:05:02.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 209  [00:05:03.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js b/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js
index 7ee857ffbffcc..6984e034c9743 100644
--- a/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js
+++ b/tests/baselines/reference/tsserver/projectErrors/reports-errors-correctly-when-file-referenced-by-inferred-project-root,-is-opened-right-after-closing-the-root-file.js
@@ -293,43 +293,51 @@ Info 36   [00:02:15.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 37   [00:02:16.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/test/backend/index.js","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 38   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/test/backend/index.js","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 39   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/test/backend/index.js","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 40   [00:02:19.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/client/app.js","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 41   [00:02:20.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/client/app.js","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 42   [00:02:21.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/client/app.js","diagnostics":[]}}
 Info 43   [00:02:22.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -558,40 +566,48 @@ Info 72   [00:03:28.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 73   [00:03:29.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/server/utilities.js","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 74   [00:03:30.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/server/utilities.js","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 75   [00:03:31.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/server/utilities.js","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+4: checkOne
 
 Info 76   [00:03:32.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/client/app.js","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: semanticCheck
 
 Info 77   [00:03:33.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/client/app.js","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+8: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+8: suggestionCheck
 
 Info 78   [00:03:34.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/client/app.js","diagnostics":[]}}
 Info 79   [00:03:35.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/should-not-report-incorrect-error-when-json-is-root-file-found-by-tsconfig.js b/tests/baselines/reference/tsserver/projectErrors/should-not-report-incorrect-error-when-json-is-root-file-found-by-tsconfig.js
index e5463acf86fcc..c4c1b3f54d8eb 100644
--- a/tests/baselines/reference/tsserver/projectErrors/should-not-report-incorrect-error-when-json-is-root-file-found-by-tsconfig.js
+++ b/tests/baselines/reference/tsserver/projectErrors/should-not-report-incorrect-error-when-json-is-root-file-found-by-tsconfig.js
@@ -137,22 +137,26 @@ Info 28   [00:00:59.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 29   [00:01:00.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 30   [00:01:01.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 31   [00:01:02.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/test.ts","diagnostics":[]}}
 Info 32   [00:01:03.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/should-report-error-when-json-is-not-root-file-found-by-tsconfig.js b/tests/baselines/reference/tsserver/projectErrors/should-report-error-when-json-is-not-root-file-found-by-tsconfig.js
index be6bf15ba59be..8021f18912dd0 100644
--- a/tests/baselines/reference/tsserver/projectErrors/should-report-error-when-json-is-not-root-file-found-by-tsconfig.js
+++ b/tests/baselines/reference/tsserver/projectErrors/should-report-error-when-json-is-not-root-file-found-by-tsconfig.js
@@ -135,22 +135,26 @@ Info 28   [00:00:59.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 29   [00:01:00.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 30   [00:01:01.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/test.ts","diagnostics":[{"start":{"line":1,"offset":25},"end":{"line":1,"offset":40},"text":"File '/user/username/projects/myproject/src/blabla.json' is not listed within the file list of project '/user/username/projects/myproject/tsconfig.json'. Projects must list all files or use an 'include' pattern.","code":6307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 31   [00:01:02.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/test.ts","diagnostics":[]}}
 Info 32   [00:01:03.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js
index a024dd0876596..c610dea9b20a0 100644
--- a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js
+++ b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-with-projectRoot.js
@@ -84,8 +84,6 @@ ScriptInfos:
 path: /user/someuser/projects/somefolder/untitled:untitled-1 fileName: untitled:Untitled-1
 path: /a/lib/lib.d.ts fileName: /a/lib/lib.d.ts
 
-Checking timeout queue length: 0
-
 Before request
 
 Info 15   [00:00:46.000] request:
@@ -106,22 +104,26 @@ Info 16   [00:00:47.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 17   [00:00:48.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"untitled:Untitled-1","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 18   [00:00:49.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"untitled:Untitled-1","diagnostics":[{"start":{"line":1,"offset":22},"end":{"line":1,"offset":63},"text":"File '../../../../../../typings/@epic/Core.d.ts' not found.","code":6053,"category":"error"},{"start":{"line":2,"offset":22},"end":{"line":2,"offset":41},"text":"File 'src/somefile.d.ts' not found.","code":6053,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 19   [00:00:50.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"untitled:Untitled-1","diagnostics":[]}}
 Info 20   [00:00:51.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js
index b1862fb43f15e..2fa7075590630 100644
--- a/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js
+++ b/tests/baselines/reference/tsserver/projectErrors/when-opening-new-file-that-doesnt-exist-on-disk-yet-without-projectRoot.js
@@ -79,8 +79,6 @@ ScriptInfos:
 path: /untitled:untitled-1 fileName: untitled:Untitled-1
 path: /a/lib/lib.d.ts fileName: /a/lib/lib.d.ts
 
-Checking timeout queue length: 0
-
 Before request
 
 Info 13   [00:00:44.000] request:
@@ -101,22 +99,26 @@ Info 14   [00:00:45.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 15   [00:00:46.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"untitled:Untitled-1","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 16   [00:00:47.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"untitled:Untitled-1","diagnostics":[{"start":{"line":1,"offset":22},"end":{"line":1,"offset":63},"text":"File '../../../../../../typings/@epic/Core.d.ts' not found.","code":6053,"category":"error"},{"start":{"line":2,"offset":22},"end":{"line":2,"offset":41},"text":"File 'src/somefile.d.ts' not found.","code":6053,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 17   [00:00:48.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"untitled:Untitled-1","diagnostics":[]}}
 Info 18   [00:00:49.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-getErr.js b/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-getErr.js
index 95e163033e058..6697a788d70e3 100644
--- a/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-getErr.js
+++ b/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-getErr.js
@@ -117,22 +117,26 @@ Info 23   [00:00:51.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 24   [00:00:52.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/ui.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 25   [00:00:53.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/ui.ts","diagnostics":[{"start":{"line":1,"offset":11},"end":{"line":1,"offset":39},"text":"An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your '--lib' option.","code":2697,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 26   [00:00:54.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/ui.ts","diagnostics":[]}}
 Info 27   [00:00:55.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-geterrForProject.js b/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-geterrForProject.js
index 25c3dcbaef5d8..adcb53498b557 100644
--- a/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-geterrForProject.js
+++ b/tests/baselines/reference/tsserver/projectErrors/when-semantic-error-returns-includes-global-error-geterrForProject.js
@@ -115,22 +115,26 @@ Info 23   [00:00:51.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 24   [00:00:52.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/ui.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 25   [00:00:53.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/ui.ts","diagnostics":[{"start":{"line":1,"offset":11},"end":{"line":1,"offset":39},"text":"An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your '--lib' option.","code":2697,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 26   [00:00:54.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/ui.ts","diagnostics":[]}}
 Info 27   [00:00:55.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-getErr.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-getErr.js
index 585812db21af2..9efbf09f187d7 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-getErr.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-getErr.js
@@ -175,22 +175,26 @@ Info 34   [00:01:09.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 35   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 36   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":10},"text":"Module '\"../decls/fns\"' has no exported member 'fnErr'.","code":2305,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 37   [00:01:12.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
 Info 38   [00:01:13.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-geterrForProject.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-geterrForProject.js
index be1bbf185d008..af4f41b96029c 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-geterrForProject.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-dependency-project-is-not-open-geterrForProject.js
@@ -173,43 +173,51 @@ Info 34   [00:01:09.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 35   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 36   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":10},"text":"Module '\"../decls/fns\"' has no exported member 'fnErr'.","code":2305,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 37   [00:01:12.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 38   [00:01:13.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 39   [00:01:14.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 40   [00:01:15.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 41   [00:01:16.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -229,40 +237,48 @@ Info 43   [00:01:18.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 44   [00:01:19.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 45   [00:01:20.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 46   [00:01:21.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+4: checkOne
 
 Info 47   [00:01:22.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: semanticCheck
 
 Info 48   [00:01:23.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":10},"text":"Module '\"../decls/fns\"' has no exported member 'fnErr'.","code":2305,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+8: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+8: suggestionCheck
 
 Info 49   [00:01:24.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
 Info 50   [00:01:25.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-getErr.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-getErr.js
index 1780304cec182..aebc605474ef1 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-getErr.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-getErr.js
@@ -266,40 +266,48 @@ Info 55   [00:01:41.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 56   [00:01:42.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 57   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":10},"text":"Module '\"../decls/fns\"' has no exported member 'fnErr'.","code":2305,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 58   [00:01:44.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 59   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 60   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[{"start":{"line":6,"offset":12},"end":{"line":6,"offset":13},"text":"Type 'number' is not assignable to type 'string'.","code":2322,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 61   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 62   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-geterrForProject.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-geterrForProject.js
index 68bd96b56d9df..c9f5f5ea57d6e 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-geterrForProject.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-module-scenario-when-the-depedency-file-is-open-geterrForProject.js
@@ -263,43 +263,51 @@ Info 55   [00:01:41.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 56   [00:01:42.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 57   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":10},"text":"Module '\"../decls/fns\"' has no exported member 'fnErr'.","code":2305,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 58   [00:01:44.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 59   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 60   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 61   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 62   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -319,22 +327,26 @@ Info 64   [00:01:50.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 65   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 66   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[{"start":{"line":6,"offset":12},"end":{"line":6,"offset":13},"text":"Type 'number' is not assignable to type 'string'.","code":2322,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 67   [00:01:53.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 68   [00:01:54.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js
index 8e1208c3b59ac..5c85cb797baa5 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-getErr.js
@@ -167,22 +167,26 @@ Info 32   [00:01:07.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 33   [00:01:08.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 34   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":3,"offset":1},"end":{"line":3,"offset":6},"text":"Cannot find name 'fnErr'.","code":2304,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 35   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
 Info 36   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js
index 54f7dfb910e74..cfcb41392b9df 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-dependency-project-is-not-open-geterrForProject.js
@@ -165,43 +165,51 @@ Info 32   [00:01:07.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 33   [00:01:08.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 34   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":3,"offset":1},"end":{"line":3,"offset":6},"text":"Cannot find name 'fnErr'.","code":2304,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 35   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 36   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 37   [00:01:12.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 38   [00:01:13.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 39   [00:01:14.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -221,40 +229,48 @@ Info 41   [00:01:16.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 42   [00:01:17.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 43   [00:01:18.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 44   [00:01:19.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+4: checkOne
 
 Info 45   [00:01:20.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: semanticCheck
 
 Info 46   [00:01:21.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":3,"offset":1},"end":{"line":3,"offset":6},"text":"Cannot find name 'fnErr'.","code":2304,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+8: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+8: suggestionCheck
 
 Info 47   [00:01:22.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
 Info 48   [00:01:23.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js
index dd2565649da79..1216ed7da8c90 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-getErr.js
@@ -256,40 +256,48 @@ Info 53   [00:01:39.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 54   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 55   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":3,"offset":1},"end":{"line":3,"offset":6},"text":"Cannot find name 'fnErr'.","code":2304,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 56   [00:01:42.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 57   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 58   [00:01:44.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":6},"text":"Type 'number' is not assignable to type 'string'.","code":2322,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 59   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 60   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js
index 7b4a74eeaae10..7d209983d3b96 100644
--- a/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js
+++ b/tests/baselines/reference/tsserver/projectReferenceErrors/with-non-module-when-the-depedency-file-is-open-geterrForProject.js
@@ -253,43 +253,51 @@ Info 53   [00:01:39.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 54   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 55   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[{"start":{"line":3,"offset":1},"end":{"line":3,"offset":6},"text":"Cannot find name 'fnErr'.","code":2304,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 56   [00:01:42.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/usage/usage.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 57   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 58   [00:01:44.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 59   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 60   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -309,22 +317,26 @@ Info 62   [00:01:48.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+3: checkOne
 
 Info 63   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: semanticCheck
 
 Info 64   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":6},"text":"Type 'number' is not assignable to type 'string'.","code":2322,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+6: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: suggestionCheck
 
 Info 65   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/dependency/fns.ts","diagnostics":[]}}
 Info 66   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js
index f0a51a9e46b55..4f195d030f657 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built-with-preserveSymlinks.js
@@ -380,25 +380,29 @@ Info 44   [00:02:01.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:02.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:03.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:04.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:02:05.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -455,7 +459,8 @@ Info 52   [00:02:09.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:10.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:11.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -469,18 +474,21 @@ Info 56   [00:02:13.000] 	Files (4)
 Info 57   [00:02:14.000] -----------------------------------------------
 Info 58   [00:02:15.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:16.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js
index a0318cf9d8059..6494e292a4938 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-built.js
@@ -378,25 +378,29 @@ Info 44   [00:02:01.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:02.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:03.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:04.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:02:05.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -453,7 +457,8 @@ Info 52   [00:02:09.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:10.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:11.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -467,18 +472,21 @@ Info 56   [00:02:13.000] 	Files (4)
 Info 57   [00:02:14.000] -----------------------------------------------
 Info 58   [00:02:15.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:16.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js
index 73998e6b8f093..511a5b5f816ff 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built-with-preserveSymlinks.js
@@ -202,25 +202,29 @@ Info 44   [00:01:33.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:34.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -277,7 +281,8 @@ Info 52   [00:01:41.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:42.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:43.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -291,18 +296,21 @@ Info 56   [00:01:45.000] 	Files (4)
 Info 57   [00:01:46.000] -----------------------------------------------
 Info 58   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js
index bf8217b7bd629..544fb4f858965 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-and-solution-is-not-built.js
@@ -200,25 +200,29 @@ Info 44   [00:01:33.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:34.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -275,7 +279,8 @@ Info 52   [00:01:41.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:42.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:43.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -289,18 +294,21 @@ Info 56   [00:01:45.000] 	Files (4)
 Info 57   [00:01:46.000] -----------------------------------------------
 Info 58   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js
index fa336db6e0efa..a2951341f56bd 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js
@@ -380,25 +380,29 @@ Info 44   [00:02:03.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:04.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:05.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:06.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -455,7 +459,8 @@ Info 52   [00:02:11.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:12.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:13.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -469,18 +474,21 @@ Info 56   [00:02:15.000] 	Files (4)
 Info 57   [00:02:16.000] -----------------------------------------------
 Info 58   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:19.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:02:20.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js
index 866e9c465e65a..3b5db1ac040b3 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-built.js
@@ -378,25 +378,29 @@ Info 44   [00:02:03.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:04.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:05.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:06.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -453,7 +457,8 @@ Info 52   [00:02:11.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:12.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:13.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -467,18 +472,21 @@ Info 56   [00:02:15.000] 	Files (4)
 Info 57   [00:02:16.000] -----------------------------------------------
 Info 58   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:19.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:02:20.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js
index 923234af8809e..b3df4cf77265d 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js
@@ -202,25 +202,29 @@ Info 44   [00:01:35.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -277,7 +281,8 @@ Info 52   [00:01:43.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:44.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:45.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -291,18 +296,21 @@ Info 56   [00:01:47.000] 	Files (4)
 Info 57   [00:01:48.000] -----------------------------------------------
 Info 58   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js
index f48b6c8111349..055f83fc41e4e 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-packageJson-has-types-field-and-has-index.ts-with-scoped-package-and-solution-is-not-built.js
@@ -200,25 +200,29 @@ Info 44   [00:01:35.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 48   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -275,7 +279,8 @@ Info 52   [00:01:43.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:44.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:45.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -289,18 +294,21 @@ Info 56   [00:01:47.000] 	Files (4)
 Info 57   [00:01:48.000] -----------------------------------------------
 Info 58   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/index.ts","diagnostics":[]}}
 Info 61   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js
index 90c8ada41c87c..c54767d3a1627 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built-with-preserveSymlinks.js
@@ -380,25 +380,29 @@ Info 44   [00:02:06.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:08.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:09.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:02:10.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -455,7 +459,8 @@ Info 52   [00:02:14.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:15.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:16.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -469,18 +474,21 @@ Info 56   [00:02:18.000] 	Files (4)
 Info 57   [00:02:19.000] -----------------------------------------------
 Info 58   [00:02:20.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:21.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:22.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:02:23.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js
index 948889fbeaa97..f13c67d66775f 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-built.js
@@ -378,25 +378,29 @@ Info 44   [00:02:06.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:07.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:08.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:09.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:02:10.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -453,7 +457,8 @@ Info 52   [00:02:14.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:15.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:16.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -467,18 +472,21 @@ Info 56   [00:02:18.000] 	Files (4)
 Info 57   [00:02:19.000] -----------------------------------------------
 Info 58   [00:02:20.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:21.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:22.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:02:23.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js
index c18d35ae6f097..8fd3a7ae6e85d 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built-with-preserveSymlinks.js
@@ -202,25 +202,29 @@ Info 44   [00:01:35.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -277,7 +281,8 @@ Info 52   [00:01:43.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:44.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:45.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -291,18 +296,21 @@ Info 56   [00:01:47.000] 	Files (4)
 Info 57   [00:01:48.000] -----------------------------------------------
 Info 58   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js
index 93ed37cb19c1a..790611c8d199c 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-and-solution-is-not-built.js
@@ -200,25 +200,29 @@ Info 44   [00:01:35.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -275,7 +279,8 @@ Info 52   [00:01:43.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:44.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:45.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -289,18 +294,21 @@ Info 56   [00:01:47.000] 	Files (4)
 Info 57   [00:01:48.000] -----------------------------------------------
 Info 58   [00:01:49.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:50.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js
index 1f89b924c5ef1..870e31d345ca0 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built-with-preserveSymlinks.js
@@ -380,25 +380,29 @@ Info 44   [00:02:08.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:09.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:10.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:11.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:02:12.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -455,7 +459,8 @@ Info 52   [00:02:16.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:17.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:18.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -469,18 +474,21 @@ Info 56   [00:02:20.000] 	Files (4)
 Info 57   [00:02:21.000] -----------------------------------------------
 Info 58   [00:02:22.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:23.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:24.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:02:25.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js
index 6ca31cd6ca2e8..822ca2b97338c 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-built.js
@@ -378,25 +378,29 @@ Info 44   [00:02:08.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:02:09.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:02:10.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:02:11.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:02:12.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -453,7 +457,8 @@ Info 52   [00:02:16.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:02:17.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:02:18.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -467,18 +472,21 @@ Info 56   [00:02:20.000] 	Files (4)
 Info 57   [00:02:21.000] -----------------------------------------------
 Info 58   [00:02:22.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:02:23.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:02:24.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:02:25.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js
index fefe298f92df4..4c8da501a1ddb 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built-with-preserveSymlinks.js
@@ -202,25 +202,29 @@ Info 44   [00:01:37.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -277,7 +281,8 @@ Info 52   [00:01:45.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:46.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:47.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -291,18 +296,21 @@ Info 56   [00:01:49.000] 	Files (4)
 Info 57   [00:01:50.000] -----------------------------------------------
 Info 58   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:53.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:01:54.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js
index a1eb526df36dd..04e8fb8b7e103 100644
--- a/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js
+++ b/tests/baselines/reference/tsserver/projectReferences/monorepo-like-with-symlinks-when-referencing-file-from-subFolder-with-scoped-package-and-solution-is-not-built.js
@@ -200,25 +200,29 @@ Info 44   [00:01:37.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 48   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Before request
 
@@ -275,7 +279,8 @@ Info 52   [00:01:45.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 53   [00:01:46.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json
 Info 54   [00:01:47.000] Finishing updateGraphWorker: Project: /user/username/projects/myproject/packages/A/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
@@ -289,18 +294,21 @@ Info 56   [00:01:49.000] 	Files (4)
 Info 57   [00:01:50.000] -----------------------------------------------
 Info 58   [00:01:51.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 59   [00:01:52.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 60   [00:01:53.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/A/src/test.ts","diagnostics":[]}}
 Info 61   [00:01:54.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js
index d9e4b8a1bd959..2bc50d067568a 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open-with-disableSourceOfProjectReferenceRedirect.js
@@ -143,7 +143,9 @@ Info 29   [00:01:10.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 30   [00:01:11.000] Scheduled: /user/username/projects/myproject/projects/project2/tsconfig.json
 Info 31   [00:01:12.000] Scheduled: *ensureProjectForOpenFiles*
 Info 32   [00:01:13.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/projects/project2/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.ts]
 class class3 {}
 
@@ -176,7 +178,7 @@ Info 43   [00:01:32.000] -----------------------------------------------
 Info 43   [00:01:33.000] Open files: 
 Info 43   [00:01:34.000] 	FileName: /user/username/projects/myproject/projects/project2/class2.ts ProjectRootPath: undefined
 Info 43   [00:01:35.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -212,7 +214,9 @@ Info 47   [00:01:42.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 48   [00:01:43.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 49   [00:01:44.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 50   [00:01:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/projects/project2/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts]
 declare class class3 {}
 
@@ -284,7 +288,7 @@ Info 61   [00:02:04.000] -----------------------------------------------
 Info 61   [00:02:05.000] Open files: 
 Info 61   [00:02:06.000] 	FileName: /user/username/projects/myproject/projects/project2/class2.ts ProjectRootPath: undefined
 Info 61   [00:02:07.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -318,12 +322,12 @@ Info 63   [00:02:13.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 64   [00:02:15.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 65   [00:02:16.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Info 66   [00:02:17.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/projects/project1/temp/file.d.ts]
 declare class file {}
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
 
 Info 67   [00:02:19.000] FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined WatchType: Closed Script info
 Info 68   [00:02:20.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined WatchType: Closed Script info
@@ -333,7 +337,9 @@ Info 71   [00:02:23.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 72   [00:02:24.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 73   [00:02:25.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 74   [00:02:26.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+5: /user/username/projects/myproject/projects/project2/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts] deleted
 
 PolledWatches::
@@ -400,7 +406,7 @@ Info 85   [00:02:45.000] -----------------------------------------------
 Info 85   [00:02:46.000] Open files: 
 Info 85   [00:02:47.000] 	FileName: /user/username/projects/myproject/projects/project2/class2.ts ProjectRootPath: undefined
 Info 85   [00:02:48.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -436,7 +442,9 @@ Info 89   [00:02:55.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 90   [00:02:56.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 91   [00:02:57.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 92   [00:02:58.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+7: /user/username/projects/myproject/projects/project2/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts]
 declare class class3 {}
 
@@ -508,7 +516,7 @@ Info 103  [00:03:17.000] -----------------------------------------------
 Info 103  [00:03:18.000] Open files: 
 Info 103  [00:03:19.000] 	FileName: /user/username/projects/myproject/projects/project2/class2.ts ProjectRootPath: undefined
 Info 103  [00:03:20.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js
index 7075d7e8126c9..6001b5c68b06e 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-not-open.js
@@ -142,7 +142,9 @@ Info 29   [00:01:10.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 30   [00:01:11.000] Scheduled: /user/username/projects/myproject/projects/project2/tsconfig.json
 Info 31   [00:01:12.000] Scheduled: *ensureProjectForOpenFiles*
 Info 32   [00:01:13.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/projects/project2/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.ts]
 class class3 {}
 
@@ -186,7 +188,7 @@ Info 43   [00:01:32.000] -----------------------------------------------
 Info 43   [00:01:33.000] Open files: 
 Info 43   [00:01:34.000] 	FileName: /user/username/projects/myproject/projects/project2/class2.ts ProjectRootPath: undefined
 Info 43   [00:01:35.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -220,19 +222,19 @@ Info 45   [00:01:41.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 46   [00:01:43.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 47   [00:01:44.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Info 48   [00:01:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/projects/project1/temp/file.d.ts]
 declare class file {}
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
 
 Info 49   [00:01:48.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 50   [00:01:49.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 51   [00:01:50.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts]
 declare class class3 {}
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js
index 359310ae0cf44..c906104f30ed8 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open-with-disableSourceOfProjectReferenceRedirect.js
@@ -226,7 +226,10 @@ Info 49   [00:01:41.000] Scheduled: *ensureProjectForOpenFiles*
 Info 50   [00:01:42.000] Scheduled: /user/username/projects/myproject/projects/project1/tsconfig.json
 Info 51   [00:01:43.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 52   [00:01:44.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/projects/project2/tsconfig.json
+3: /user/username/projects/myproject/projects/project1/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.ts]
 class class3 {}
 
@@ -290,7 +293,7 @@ Info 70   [00:02:20.000] 	FileName: /user/username/projects/myproject/projects/p
 Info 70   [00:02:21.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
 Info 70   [00:02:22.000] 	FileName: /user/username/projects/myproject/projects/project1/class1.ts ProjectRootPath: undefined
 Info 70   [00:02:23.000] 		Projects: /user/username/projects/myproject/projects/project1/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -330,7 +333,9 @@ Info 74   [00:02:30.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 75   [00:02:31.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 76   [00:02:32.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 77   [00:02:33.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+5: /user/username/projects/myproject/projects/project2/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts]
 declare class class3 {}
 
@@ -418,7 +423,7 @@ Info 88   [00:03:02.000] 	FileName: /user/username/projects/myproject/projects/p
 Info 88   [00:03:03.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
 Info 88   [00:03:04.000] 	FileName: /user/username/projects/myproject/projects/project1/class1.ts ProjectRootPath: undefined
 Info 88   [00:03:05.000] 		Projects: /user/username/projects/myproject/projects/project1/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -456,12 +461,12 @@ Info 90   [00:03:11.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 91   [00:03:13.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 92   [00:03:14.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Info 93   [00:03:15.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/projects/project1/temp/file.d.ts]
 declare class file {}
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
 
 Info 94   [00:03:17.000] FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined WatchType: Closed Script info
 Info 95   [00:03:18.000] FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined WatchType: Closed Script info
@@ -471,7 +476,9 @@ Info 98   [00:03:21.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 99   [00:03:22.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 100  [00:03:23.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 101  [00:03:24.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+7: /user/username/projects/myproject/projects/project2/tsconfig.json
+8: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts] deleted
 
 PolledWatches::
@@ -554,7 +561,7 @@ Info 112  [00:03:53.000] 	FileName: /user/username/projects/myproject/projects/p
 Info 112  [00:03:54.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
 Info 112  [00:03:55.000] 	FileName: /user/username/projects/myproject/projects/project1/class1.ts ProjectRootPath: undefined
 Info 112  [00:03:56.000] 		Projects: /user/username/projects/myproject/projects/project1/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -594,7 +601,9 @@ Info 116  [00:04:03.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 117  [00:04:04.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 118  [00:04:05.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 119  [00:04:06.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+9: /user/username/projects/myproject/projects/project2/tsconfig.json
+10: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts]
 declare class class3 {}
 
@@ -682,7 +691,7 @@ Info 130  [00:04:35.000] 	FileName: /user/username/projects/myproject/projects/p
 Info 130  [00:04:36.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
 Info 130  [00:04:37.000] 	FileName: /user/username/projects/myproject/projects/project1/class1.ts ProjectRootPath: undefined
 Info 130  [00:04:38.000] 		Projects: /user/username/projects/myproject/projects/project1/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js
index 6a057867debce..b59ecbf208b03 100644
--- a/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js
+++ b/tests/baselines/reference/tsserver/projectReferences/new-file-is-added-to-the-referenced-project-when-referenced-project-is-open.js
@@ -228,7 +228,10 @@ Info 50   [00:01:42.000] Scheduled: *ensureProjectForOpenFiles*
 Info 51   [00:01:43.000] Scheduled: /user/username/projects/myproject/projects/project1/tsconfig.json
 Info 52   [00:01:44.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 53   [00:01:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/projects/project2/tsconfig.json
+3: /user/username/projects/myproject/projects/project1/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/projects/project1/class3.ts]
 class class3 {}
 
@@ -302,7 +305,7 @@ Info 70   [00:02:20.000] 	FileName: /user/username/projects/myproject/projects/p
 Info 70   [00:02:21.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json
 Info 70   [00:02:22.000] 	FileName: /user/username/projects/myproject/projects/project1/class1.ts ProjectRootPath: undefined
 Info 70   [00:02:23.000] 		Projects: /user/username/projects/myproject/projects/project2/tsconfig.json,/user/username/projects/myproject/projects/project1/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/projects/project2/node_modules/@types:
@@ -336,19 +339,19 @@ Info 72   [00:02:29.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 73   [00:02:31.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 74   [00:02:32.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Info 75   [00:02:33.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/projects/project1/temp/file.d.ts]
 declare class file {}
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
 
 Info 76   [00:02:36.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
 Info 77   [00:02:37.000] Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Info 78   [00:02:38.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Config: /user/username/projects/myproject/projects/project1/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/projects/project1/class3.d.ts]
 declare class class3 {}
 
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js
index 27a60e4048b1d..d3f75dd3347a6 100644
--- a/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js
+++ b/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js
@@ -179,25 +179,29 @@ Info 35   [00:01:39.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 36   [00:01:40.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 37   [00:01:41.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 38   [00:01:42.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 39   [00:01:43.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":1}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 40   [00:01:44.000] Search path: /dummy
 Info 41   [00:01:45.000] For info: /dummy/dummy.ts :: No config files found.
diff --git a/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js
index 6715c83d7825f..b7a88189612e0 100644
--- a/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js
+++ b/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js
@@ -239,25 +239,29 @@ Info 39   [00:01:55.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 40   [00:01:56.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 41   [00:01:57.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 42   [00:01:58.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 43   [00:01:59.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":1}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 44   [00:02:00.000] Search path: /dummy
 Info 45   [00:02:01.000] For info: /dummy/dummy.ts :: No config files found.
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
index d3bfb3b04896c..d3941474fa83b 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
@@ -205,25 +205,29 @@ Info 36   [00:01:44.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 37   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 38   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 39   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 40   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":1}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 41   [00:01:49.000] Search path: /dummy
 Info 42   [00:01:50.000] For info: /dummy/dummy.ts :: No config files found.
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
index 8515f60e20e3c..ae1abfffe5a16 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
@@ -270,25 +270,29 @@ Info 41   [00:02:01.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 42   [00:02:02.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 43   [00:02:03.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 44   [00:02:04.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/src/main.ts","diagnostics":[]}}
 Info 45   [00:02:05.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":1}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 46   [00:02:06.000] Search path: /dummy
 Info 47   [00:02:07.000] For info: /dummy/dummy.ts :: No config files found.
diff --git a/tests/baselines/reference/tsserver/projectReferences/when-the-referenced-projects-have-allowJs-and-emitDeclarationOnly.js b/tests/baselines/reference/tsserver/projectReferences/when-the-referenced-projects-have-allowJs-and-emitDeclarationOnly.js
index be9e54f5f6588..88d97cfef4435 100644
--- a/tests/baselines/reference/tsserver/projectReferences/when-the-referenced-projects-have-allowJs-and-emitDeclarationOnly.js
+++ b/tests/baselines/reference/tsserver/projectReferences/when-the-referenced-projects-have-allowJs-and-emitDeclarationOnly.js
@@ -209,22 +209,26 @@ Info 44   [00:01:33.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:34.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/projects/myproject/packages/consumer/src/index.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/user/username/projects/myproject/packages/consumer/src/index.ts","diagnostics":[{"start":{"line":3,"offset":42},"end":{"line":3,"offset":44},"text":"Expected 1 arguments, but got 2.","code":2554,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/user/username/projects/myproject/packages/consumer/src/index.ts","diagnostics":[]}}
 Info 48   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
index da2f0a1e74b72..3024c099c3061 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
@@ -469,7 +469,9 @@ Info 44   [00:02:07.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 45   [00:02:08.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 46   [00:02:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:02:10.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/dependency/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -513,7 +515,7 @@ Info 55   [00:02:36.000] 	FileName: /user/username/projects/myproject/dependency
 Info 55   [00:02:37.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 55   [00:02:38.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 55   [00:02:39.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
index ada64cef9d0bd..8485354cbe420 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -469,7 +469,9 @@ Info 44   [00:02:07.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 45   [00:02:08.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 46   [00:02:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:02:10.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/dependency/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -507,7 +509,7 @@ Info 55   [00:02:36.000] 	FileName: /user/username/projects/myproject/dependency
 Info 55   [00:02:37.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 55   [00:02:38.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 55   [00:02:39.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js
index 899551ab37433..ade06f0f16a9c 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js
@@ -487,9 +487,9 @@ Info 45   [00:02:05.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js
index bb199750f0521..ded7ac98e47ae 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js
@@ -469,7 +469,9 @@ Info 44   [00:02:04.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 45   [00:02:05.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 46   [00:02:06.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:02:07.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/dependency/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -513,7 +515,7 @@ Info 55   [00:02:33.000] 	FileName: /user/username/projects/myproject/dependency
 Info 55   [00:02:34.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 55   [00:02:35.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 55   [00:02:36.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
index fb84be6ae30aa..bfc092de26113 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -469,7 +469,9 @@ Info 44   [00:02:04.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 45   [00:02:05.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 46   [00:02:06.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:02:07.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/dependency/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -507,7 +509,7 @@ Info 55   [00:02:33.000] 	FileName: /user/username/projects/myproject/dependency
 Info 55   [00:02:34.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 55   [00:02:35.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 55   [00:02:36.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js
index 66d5eba0fbe85..dee31a32dc8ef 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js
@@ -487,9 +487,9 @@ Info 45   [00:02:02.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js
index bc92955c9ec2b..7a8f1dd37940b 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js
@@ -487,9 +487,9 @@ Info 45   [00:02:02.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
index fbed3db921482..732a1ea9ebf88 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
@@ -469,7 +469,9 @@ Info 44   [00:02:07.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 45   [00:02:08.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 46   [00:02:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:02:10.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/dependency/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -513,7 +515,7 @@ Info 55   [00:02:36.000] 	FileName: /user/username/projects/myproject/dependency
 Info 55   [00:02:37.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 55   [00:02:38.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 55   [00:02:39.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
index 550c709683744..27ebc4e3e0a0b 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -469,7 +469,9 @@ Info 44   [00:02:07.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 45   [00:02:08.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 46   [00:02:09.000] Scheduled: *ensureProjectForOpenFiles*
 Info 47   [00:02:10.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/dependency/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -507,7 +509,7 @@ Info 55   [00:02:36.000] 	FileName: /user/username/projects/myproject/dependency
 Info 55   [00:02:37.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 55   [00:02:38.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 55   [00:02:39.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
index 409f4fea1d8a3..1586d9748abfc 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
@@ -487,9 +487,9 @@ Info 45   [00:02:05.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
index 3389c2a2f3e9a..83bef08c84e5e 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
@@ -683,7 +683,10 @@ Info 72   [00:02:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 73   [00:02:52.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 74   [00:02:53.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 75   [00:02:54.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/fns.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/main/tsconfig.json
+3: /user/username/projects/myproject/dependency/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -749,7 +752,7 @@ Info 89   [00:03:36.000] 	FileName: /user/username/projects/myproject/dependency
 Info 89   [00:03:37.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 89   [00:03:38.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 89   [00:03:39.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
index 27868aa9d34b7..06851a179f92b 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -683,7 +683,10 @@ Info 72   [00:02:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 73   [00:02:52.000] Scheduled: /user/username/projects/myproject/main/tsconfig.json
 Info 74   [00:02:53.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 75   [00:02:54.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/dependency/tsconfig.json
+3: /user/username/projects/myproject/main/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -737,7 +740,7 @@ Info 87   [00:03:34.000] 	FileName: /user/username/projects/myproject/dependency
 Info 87   [00:03:35.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 87   [00:03:36.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 87   [00:03:37.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js
index 8ab768c4cea5c..29403cb0d79d6 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js
@@ -721,9 +721,9 @@ Info 73   [00:02:49.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js
index 15391b5b22482..38e68090be074 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js
@@ -694,7 +694,10 @@ Info 73   [00:02:49.000] Scheduled: /user/username/projects/myproject/main/tscon
 Info 74   [00:02:50.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 75   [00:02:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 76   [00:02:52.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/main/tsconfig.json
+2: /user/username/projects/myproject/dependency/tsconfig.json
+3: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -754,7 +757,7 @@ Info 88   [00:03:32.000] 	FileName: /user/username/projects/myproject/dependency
 Info 88   [00:03:33.000] 		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
 Info 88   [00:03:34.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 88   [00:03:35.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
index 3d27ff409c660..343b414b0ec63 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -694,7 +694,10 @@ Info 73   [00:02:49.000] Scheduled: /user/username/projects/myproject/main/tscon
 Info 74   [00:02:50.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 75   [00:02:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 76   [00:02:52.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/main/tsconfig.json
+2: /user/username/projects/myproject/dependency/tsconfig.json
+3: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -748,7 +751,7 @@ Info 88   [00:03:32.000] 	FileName: /user/username/projects/myproject/dependency
 Info 88   [00:03:33.000] 		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
 Info 88   [00:03:34.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 88   [00:03:35.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js
index 6586cc00f2fd3..ebd64ccf65da8 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js
@@ -711,9 +711,9 @@ Info 73   [00:02:46.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js
index 90f12eb54871a..71ccf7ba0094e 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js
@@ -733,9 +733,9 @@ Info 75   [00:02:48.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
index f50f645f3d5b6..95bed0374642e 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
@@ -694,7 +694,10 @@ Info 72   [00:02:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 73   [00:02:52.000] Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
 Info 74   [00:02:53.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 75   [00:02:54.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/fns.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/main/tsconfig.json
+3: /user/username/projects/myproject/dependency/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -760,7 +763,7 @@ Info 89   [00:03:36.000] 	FileName: /user/username/projects/myproject/dependency
 Info 89   [00:03:37.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 89   [00:03:38.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 89   [00:03:39.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
index 9df8c3a723c3e..a1904b16ef6ec 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -694,7 +694,10 @@ Info 72   [00:02:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 73   [00:02:52.000] Scheduled: /user/username/projects/myproject/main/tsconfig.json
 Info 74   [00:02:53.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 75   [00:02:54.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/dependency/tsconfig.json
+3: /user/username/projects/myproject/main/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -748,7 +751,7 @@ Info 87   [00:03:34.000] 	FileName: /user/username/projects/myproject/dependency
 Info 87   [00:03:35.000] 		Projects: /user/username/projects/myproject/dependency/tsconfig.json
 Info 87   [00:03:36.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 87   [00:03:37.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
index a36df32b75599..254dd9267678e 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
@@ -732,9 +732,9 @@ Info 73   [00:02:49.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
index 14a3747376da8..a13a3f303035b 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
@@ -475,7 +475,9 @@ Info 47   [00:02:10.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 48   [00:02:11.000] Scheduled: /user/username/projects/myproject/main/tsconfig.json
 Info 49   [00:02:12.000] Scheduled: *ensureProjectForOpenFiles*
 Info 50   [00:02:13.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/fns.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/main/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -525,7 +527,7 @@ Info 60   [00:02:41.000] 	FileName: /user/username/projects/myproject/main/main.
 Info 60   [00:02:42.000] 		Projects: /user/username/projects/myproject/main/tsconfig.json
 Info 60   [00:02:43.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 60   [00:02:44.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
index 14b8e11cbc737..fc910150723e6 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -475,7 +475,9 @@ Info 47   [00:02:10.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 48   [00:02:11.000] Scheduled: /user/username/projects/myproject/main/tsconfig.json
 Info 49   [00:02:12.000] Scheduled: *ensureProjectForOpenFiles*
 Info 50   [00:02:13.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/main/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -513,7 +515,7 @@ Info 58   [00:02:39.000] 	FileName: /user/username/projects/myproject/main/main.
 Info 58   [00:02:40.000] 		Projects: /user/username/projects/myproject/main/tsconfig.json
 Info 58   [00:02:41.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 58   [00:02:42.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js
index 4652abd980f4d..faedaaba3039e 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js
@@ -493,9 +493,9 @@ Info 48   [00:02:08.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js
index 4776bb5924518..4c50c9e79b918 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js
@@ -467,7 +467,7 @@ Info 48   [00:02:05.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -478,7 +478,7 @@ export declare function fn6(): void;
 //# sourceMappingURL=FnS.d.ts.map
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
index 4f3d4ba6a785d..1fec31e38558e 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -467,12 +467,12 @@ Info 48   [00:02:05.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js
index ee4f913824c57..af9358553d612 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js
@@ -471,7 +471,9 @@ Info 49   [00:02:09.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 50   [00:02:10.000] Scheduled: /user/username/projects/myproject/main/tsconfig.json
 Info 51   [00:02:11.000] Scheduled: *ensureProjectForOpenFiles*
 Info 52   [00:02:12.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/dependency/FnS.ts 1:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/main/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/dependency/FnS.ts]
 function fooBar() { }
 export function fn1() { }
@@ -521,7 +523,7 @@ Info 62   [00:02:40.000] 	FileName: /user/username/projects/myproject/main/main.
 Info 62   [00:02:41.000] 		Projects: /user/username/projects/myproject/main/tsconfig.json
 Info 62   [00:02:42.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 62   [00:02:43.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js
index ea747fff572ea..c0c47d403e2e8 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js
@@ -489,9 +489,9 @@ Info 50   [00:02:07.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
index 1b36673ec11c9..c26c6f55cef4b 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
@@ -508,7 +508,9 @@ Info 51   [00:02:14.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 52   [00:02:15.000] Scheduled: /user/username/projects/myproject/main/tsconfig.json
 Info 53   [00:02:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 54   [00:02:17.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/fns.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/main/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts]
 export declare function fn1(): void;
 export declare function fn2(): void;
@@ -558,7 +560,7 @@ Info 64   [00:02:45.000] 	FileName: /user/username/projects/myproject/main/main.
 Info 64   [00:02:46.000] 		Projects: /user/username/projects/myproject/main/tsconfig.json
 Info 64   [00:02:47.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 64   [00:02:48.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
index 80c0c5120d940..060ca8967c8b5 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -508,7 +508,9 @@ Info 51   [00:02:14.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 52   [00:02:15.000] Scheduled: /user/username/projects/myproject/main/tsconfig.json
 Info 53   [00:02:16.000] Scheduled: *ensureProjectForOpenFiles*
 Info 54   [00:02:17.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/main/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/decls/FnS.d.ts.map]
 {"version":3,"file":"FnS.d.ts","sourceRoot":"","sources":["../dependency/FnS.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,wBAAgB,GAAG,SAAM;AACzB,eAAO,MAAM,CAAC,KAAK,CAAC"}
 
@@ -546,7 +548,7 @@ Info 62   [00:02:43.000] 	FileName: /user/username/projects/myproject/main/main.
 Info 62   [00:02:44.000] 		Projects: /user/username/projects/myproject/main/tsconfig.json
 Info 62   [00:02:45.000] 	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
 Info 62   [00:02:46.000] 		Projects: /user/username/projects/myproject/random/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
index 999d4e1ce97bd..7c0498b2cdc4d 100644
--- a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
@@ -526,9 +526,9 @@ Info 52   [00:02:12.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projects/Orphan-source-files-are-handled-correctly-on-watch-trigger.js b/tests/baselines/reference/tsserver/projects/Orphan-source-files-are-handled-correctly-on-watch-trigger.js
index 7f50cc854bf55..600d5a9a07d20 100644
--- a/tests/baselines/reference/tsserver/projects/Orphan-source-files-are-handled-correctly-on-watch-trigger.js
+++ b/tests/baselines/reference/tsserver/projects/Orphan-source-files-are-handled-correctly-on-watch-trigger.js
@@ -69,7 +69,9 @@ Info 15   [00:00:49.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 16   [00:00:50.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 17   [00:00:51.000] Scheduled: *ensureProjectForOpenFiles*
 Info 18   [00:00:52.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/tsconfig.json]
 {"files":["src/file1.ts"]}
 
@@ -127,16 +129,16 @@ Info 30   [00:01:12.000] -----------------------------------------------
 Info 30   [00:01:13.000] Open files: 
 Info 30   [00:01:14.000] 	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
 Info 30   [00:01:15.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Containing projects for /user/username/projects/myproject/src/file2.ts:: 
 Info 30   [00:01:19.000] FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
 Info 31   [00:01:20.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/src/file2.ts]
 export let y = 10;export let z = 10;
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Containing projects for /user/username/projects/myproject/src/file2.ts:: 
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js b/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js
index 72154b88964da..4b97179fc74c2 100644
--- a/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js
+++ b/tests/baselines/reference/tsserver/projects/changes-in-closed-files-are-reflected-in-project-structure.js
@@ -71,7 +71,9 @@ Info 22   [00:00:57.000] FileWatcher:: Triggered with /a/b/f2.ts 1:: WatchInfo:
 Info 23   [00:00:58.000] Scheduled: /dev/null/inferredProject1*
 Info 24   [00:00:59.000] Scheduled: *ensureProjectForOpenFiles*
 Info 25   [00:01:00.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/f2.ts 1:: WatchInfo: /a/b/f2.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 //// [/a/b/f2.ts]
 export * from "../c/f3"
 
@@ -144,7 +146,7 @@ Info 41   [00:01:34.000] 	FileName: /a/b/f1.ts ProjectRootPath: undefined
 Info 41   [00:01:35.000] 		Projects: /dev/null/inferredProject1*
 Info 41   [00:01:36.000] 	FileName: /a/c/f3.ts ProjectRootPath: undefined
 Info 41   [00:01:37.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Inferred project: /dev/null/inferredProject1* isOrphan:: false isClosed: false
 Inferred project: /dev/null/inferredProject2* isOrphan:: true isClosed: false
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projects/config-file-is-deleted.js b/tests/baselines/reference/tsserver/projects/config-file-is-deleted.js
index 821fedc5c45a4..1c32a02aeb743 100644
--- a/tests/baselines/reference/tsserver/projects/config-file-is-deleted.js
+++ b/tests/baselines/reference/tsserver/projects/config-file-is-deleted.js
@@ -89,7 +89,8 @@ Info 33   [00:01:01.000] Search path: /a/b
 Info 34   [00:01:02.000] For info: /a/b/f2.ts :: No config files found.
 Info 35   [00:01:03.000] Scheduled: *ensureProjectForOpenFiles*
 Info 36   [00:01:04.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 2:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json] deleted
 
 Info 37   [00:01:05.500] Running: *ensureProjectForOpenFiles*
@@ -141,7 +142,7 @@ Info 56   [00:01:36.500] 	FileName: /a/b/f1.ts ProjectRootPath: undefined
 Info 56   [00:01:37.500] 		Projects: /dev/null/inferredProject1*
 Info 56   [00:01:38.500] 	FileName: /a/b/f2.ts ProjectRootPath: undefined
 Info 56   [00:01:39.500] 		Projects: /dev/null/inferredProject2*
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts: *new*
diff --git a/tests/baselines/reference/tsserver/projects/deleted-files-affect-project-structure.js b/tests/baselines/reference/tsserver/projects/deleted-files-affect-project-structure.js
index f8da01d5efc6e..1ac638d3bdbc1 100644
--- a/tests/baselines/reference/tsserver/projects/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tsserver/projects/deleted-files-affect-project-structure.js
@@ -59,7 +59,9 @@ Info 17   [00:00:47.000] FileWatcher:: Close:: WatchInfo: /a/b/f2.ts 500 undefin
 Info 18   [00:00:48.000] Scheduled: /dev/null/inferredProject1*
 Info 19   [00:00:49.000] Scheduled: *ensureProjectForOpenFiles*
 Info 20   [00:00:50.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/f2.ts 2:: WatchInfo: /a/b/f2.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 //// [/a/b/f2.ts] deleted
 
 PolledWatches::
@@ -123,7 +125,7 @@ Info 42   [00:01:27.000] 	FileName: /a/b/f1.ts ProjectRootPath: undefined
 Info 42   [00:01:28.000] 		Projects: /dev/null/inferredProject1*
 Info 42   [00:01:29.000] 	FileName: /a/c/f3.ts ProjectRootPath: undefined
 Info 42   [00:01:30.000] 		Projects: /dev/null/inferredProject2*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js b/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
index 24fdf31e87a7c..ccccd50c4c9e1 100644
--- a/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
+++ b/tests/baselines/reference/tsserver/projects/file-with-name-constructor.js-doesnt-cause-issue-with-typeAcquisition-when-safe-type-list.js
@@ -70,7 +70,8 @@ Info 11   [00:00:30.000] 	Files (3)
 	  Root file specified for compilation
 
 Info 12   [00:00:31.000] -----------------------------------------------
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 PolledWatches::
 /node_modules: *new*
diff --git a/tests/baselines/reference/tsserver/projects/handles-delayed-directory-watch-invoke-on-file-creation.js b/tests/baselines/reference/tsserver/projects/handles-delayed-directory-watch-invoke-on-file-creation.js
index a2c228fd4b861..ac5d4750a0177 100644
--- a/tests/baselines/reference/tsserver/projects/handles-delayed-directory-watch-invoke-on-file-creation.js
+++ b/tests/baselines/reference/tsserver/projects/handles-delayed-directory-watch-invoke-on-file-creation.js
@@ -155,9 +155,9 @@ FsWatchesRecursive::
 /users/username/projects/project:
   {}
 
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
 
 Info 28   [00:01:08.000] DirectoryWatcher:: Triggered with /users/username/projects/project/sub/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
 Info 29   [00:01:09.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/project/sub/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
@@ -169,7 +169,10 @@ Info 34   [00:01:17.000] DirectoryWatcher:: Triggered with /users/username/proje
 Info 35   [00:01:18.000] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one
 Info 36   [00:01:19.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 37   [00:01:20.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/project/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 2
+Timeout callback:: count: 2
+3: /users/username/projects/project/tsconfig.json
+4: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/users/username/projects/project/a.ts]
 export const a = 10;
 
@@ -201,7 +204,10 @@ Info 41   [00:01:30.000] response:
     }
 After request
 
-Checking timeout queue length: 2
+Timeout callback:: count: 2
+5: /users/username/projects/project/tsconfig.json
+6: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 
 Before request
 
@@ -249,7 +255,9 @@ Info 50   [00:01:47.000] response:
     }
 After request
 
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+5: /users/username/projects/project/tsconfig.json
+6: *ensureProjectForOpenFiles*
 
 Info 51   [00:01:48.000] Running: /users/username/projects/project/tsconfig.json
 Info 52   [00:01:49.000] Running: *ensureProjectForOpenFiles*
@@ -276,7 +284,7 @@ Info 55   [00:02:07.000] 		Projects: /users/username/projects/project/tsconfig.j
 Info 55   [00:02:08.000] got projects updated in background, updating diagnostics for /users/username/projects/project/b.ts,/users/username/projects/project/a.ts
 Info 56   [00:02:09.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/project/b.ts","/users/username/projects/project/a.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -304,7 +312,10 @@ Info 60   [00:02:19.000] response:
     }
 After request
 
-Checking timeout queue length: 2
+Timeout callback:: count: 2
+7: /users/username/projects/project/tsconfig.json
+8: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 
 Before request
 
@@ -401,7 +412,9 @@ FsWatchesRecursive::
 /users/username/projects/project:
   {}
 
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+7: /users/username/projects/project/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
 Info 84   [00:02:54.000] Running: /users/username/projects/project/tsconfig.json
 Info 85   [00:02:55.000] Running: *ensureProjectForOpenFiles*
@@ -436,7 +449,7 @@ Info 88   [00:03:19.000] 		Projects: /dev/null/inferredProject1*
 Info 88   [00:03:20.000] got projects updated in background, updating diagnostics for /users/username/projects/project/b.ts,/users/username/projects/project/sub/a.ts
 Info 89   [00:03:21.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/project/b.ts","/users/username/projects/project/sub/a.ts"]}}
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 90   [00:03:23.000] DirectoryWatcher:: Triggered with /users/username/projects/project/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
 Info 91   [00:03:24.000] Scheduled: /users/username/projects/project/tsconfig.json
@@ -450,7 +463,10 @@ Info 98   [00:03:35.000] DirectoryWatcher:: Triggered with /users/username/proje
 Info 99   [00:03:36.000] Scheduled: /users/username/projects/project/tsconfig.json, Cancelled earlier one
 Info 100  [00:03:37.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 101  [00:03:38.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/project/sub/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 2
+Timeout callback:: count: 2
+13: /users/username/projects/project/tsconfig.json
+14: *ensureProjectForOpenFiles*
+Immedidate callback:: count: 0
 //// [/users/username/projects/project/sub/a.ts]
 export const a = 10;
 
@@ -477,10 +493,12 @@ Info 103  [00:03:40.000] response:
     }
 After request
 
-Checking timeout queue length: 3
-
-Before running timeout callback15
+Before running Timeout callback:: count: 3
+13: /users/username/projects/project/tsconfig.json
+14: *ensureProjectForOpenFiles*
+15: checkOne
 
+Invoking Timeout callback:: timeoutId:: 15:: checkOne
 Info 104  [00:03:41.000] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/sub/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info 105  [00:03:42.000] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/sub/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
 Info 106  [00:03:43.000] FileWatcher:: Close:: WatchInfo: /users/username/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
@@ -504,7 +522,9 @@ Info 111  [00:03:48.000] 	Files (3)
 Info 112  [00:03:49.000] -----------------------------------------------
 Info 113  [00:03:50.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/project/b.ts","diagnostics":[]}}
-After running timeout callback15
+After running Timeout callback:: count: 2
+13: /users/username/projects/project/tsconfig.json
+14: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /users/username/projects/project/node_modules/@types:
@@ -532,36 +552,46 @@ FsWatchesRecursive::
 /users/username/projects/project:
   {}
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 114  [00:03:51.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/project/b.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 115  [00:03:52.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/project/b.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
-
-Checking timeout queue length: 3
+After running Immedidate callback:: count: 0
 
-Before running timeout callback16
+Before running Timeout callback:: count: 3
+13: /users/username/projects/project/tsconfig.json
+14: *ensureProjectForOpenFiles*
+16: checkOne
 
+Invoking Timeout callback:: timeoutId:: 16:: checkOne
 Info 116  [00:03:53.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/project/sub/a.ts","diagnostics":[]}}
-After running timeout callback16
+After running Timeout callback:: count: 2
+13: /users/username/projects/project/tsconfig.json
+14: *ensureProjectForOpenFiles*
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 117  [00:03:54.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/project/sub/a.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 118  [00:03:55.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/project/sub/a.ts","diagnostics":[]}}
 Info 119  [00:03:56.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":7}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js b/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js
index 3a2e59dcd09b0..95027ecf8db16 100644
--- a/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js
+++ b/tests/baselines/reference/tsserver/projects/handles-the-missing-files-added-with-tripleslash-ref.js
@@ -121,7 +121,9 @@ Info 17   [00:00:38.000] FileWatcher:: Close:: WatchInfo: /a/b/commonfile2.ts 50
 Info 18   [00:00:39.000] Scheduled: /dev/null/inferredProject1*
 Info 19   [00:00:40.000] Scheduled: *ensureProjectForOpenFiles*
 Info 20   [00:00:41.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/commonfile2.ts 0:: WatchInfo: /a/b/commonfile2.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 //// [/a/b/commonFile2.ts]
 let y = 1
 
@@ -174,7 +176,7 @@ Info 31   [00:01:00.000] -----------------------------------------------
 Info 31   [00:01:01.000] Open files: 
 Info 31   [00:01:02.000] 	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
 Info 31   [00:01:03.000] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/b/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projects/no-project-structure-update-on-directory-watch-invoke-on-open-file-save.js b/tests/baselines/reference/tsserver/projects/no-project-structure-update-on-directory-watch-invoke-on-open-file-save.js
index 5a3517412b4e4..9af38d11e1138 100644
--- a/tests/baselines/reference/tsserver/projects/no-project-structure-update-on-directory-watch-invoke-on-open-file-save.js
+++ b/tests/baselines/reference/tsserver/projects/no-project-structure-update-on-directory-watch-invoke-on-open-file-save.js
@@ -47,7 +47,8 @@ Info 16   [00:00:38.000] DirectoryWatcher:: Triggered with /users/username/proje
 Info 17   [00:00:39.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/project/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
 Info 18   [00:00:42.000] DirectoryWatcher:: Triggered with /users/username/projects/project/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
 Info 19   [00:00:43.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/project/a.ts :: WatchInfo: /users/username/projects/project 1 undefined Config: /users/username/projects/project/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/users/username/projects/project/a.ts] file changed its modified time
 
 PolledWatches::
diff --git a/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js b/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js
index 6520343c2a5b7..30617bc84c132 100644
--- a/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js
+++ b/tests/baselines/reference/tsserver/projects/should-create-new-inferred-projects-for-files-excluded-from-a-configured-project.js
@@ -83,7 +83,9 @@ Info 17   [00:00:39.000] FileWatcher:: Triggered with /a/b/tsconfig.json 1:: Wat
 Info 18   [00:00:40.000] Scheduled: /a/b/tsconfig.json
 Info 19   [00:00:41.000] Scheduled: *ensureProjectForOpenFiles*
 Info 20   [00:00:42.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/a/b/tsconfig.json]
 {
                 "compilerOptions": {},
@@ -129,7 +131,7 @@ Info 32   [00:01:02.000] -----------------------------------------------
 Info 32   [00:01:03.000] Open files: 
 Info 32   [00:01:04.000] 	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
 Info 32   [00:01:05.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js b/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js
index 88c1f430c73de..b36377e62dda7 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js
@@ -200,7 +200,9 @@ Info 29   [00:01:16.000] FileWatcher:: Triggered with /user/username/projects/sa
 Info 30   [00:01:17.000] Scheduled: /user/username/projects/sample1/tests/tsconfig.json
 Info 31   [00:01:18.000] Scheduled: *ensureProjectForOpenFiles*
 Info 32   [00:01:19.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/sample1/logic/index.ts 1:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/sample1/tests/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/sample1/logic/index.ts]
 import * as c from '../core/index';
 export function getSecondsInDay() {
@@ -268,13 +270,15 @@ Info 42   [00:01:37.000] -----------------------------------------------
 Info 42   [00:01:38.000] Open files: 
 Info 42   [00:01:39.000] 	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
 Info 42   [00:01:40.000] 		Projects: /user/username/projects/sample1/tests/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 42   [00:01:43.000] FileWatcher:: Triggered with /user/username/projects/sample1/logic/index.ts 1:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
 Info 43   [00:01:44.000] Scheduled: /user/username/projects/sample1/tests/tsconfig.json
 Info 44   [00:01:45.000] Scheduled: *ensureProjectForOpenFiles*
 Info 45   [00:01:46.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/sample1/logic/index.ts 1:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/sample1/tests/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/sample1/logic/index.ts]
 import * as c from '../core/index';
 export function getSecondsInDay() {
@@ -314,13 +318,15 @@ Info 55   [00:02:04.000] -----------------------------------------------
 Info 55   [00:02:05.000] Open files: 
 Info 55   [00:02:06.000] 	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
 Info 55   [00:02:07.000] 		Projects: /user/username/projects/sample1/tests/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 Info 55   [00:02:11.000] FileWatcher:: Triggered with /user/username/projects/sample1/logic/tsconfig.json 1:: WatchInfo: /user/username/projects/sample1/logic/tsconfig.json 2000 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Config file
 Info 56   [00:02:12.000] Scheduled: /user/username/projects/sample1/tests/tsconfig.json
 Info 57   [00:02:13.000] Scheduled: *ensureProjectForOpenFiles*
 Info 58   [00:02:14.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/sample1/logic/tsconfig.json 1:: WatchInfo: /user/username/projects/sample1/logic/tsconfig.json 2000 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+5: /user/username/projects/sample1/tests/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/user/username/projects/sample1/logic/tsconfig.json]
 {"compilerOptions":{"composite":true,"declaration":true,"declarationDir":"decls"},"references":[{"path":"../core"}]}
 
@@ -371,4 +377,4 @@ Info 69   [00:02:33.000] -----------------------------------------------
 Info 69   [00:02:34.000] Open files: 
 Info 69   [00:02:35.000] 	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
 Info 69   [00:02:36.000] 		Projects: /user/username/projects/sample1/tests/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
index 4bf18cf10e221..00cbd150e7a52 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
@@ -152,7 +152,10 @@ Info 34   [00:01:20.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 35   [00:01:21.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 36   [00:01:22.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 37   [00:01:23.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/b/tsconfig.json] deleted
 
 PolledWatches::
@@ -237,7 +240,7 @@ Info 51   [00:01:45.000] -----------------------------------------------
 Info 51   [00:01:46.000] Open files: 
 Info 51   [00:01:47.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 51   [00:01:48.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
@@ -282,7 +285,10 @@ Info 54   [00:01:54.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 55   [00:01:55.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 56   [00:01:56.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 57   [00:01:57.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+4: /user/username/projects/myproject/c/tsconfig.json
+5: *ensureProjectForOpenFiles*
+6: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/b/tsconfig.json]
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
 
@@ -362,7 +368,7 @@ Info 72   [00:02:20.000] -----------------------------------------------
 Info 72   [00:02:21.000] Open files: 
 Info 72   [00:02:22.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 72   [00:02:23.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
index b106e4e881948..aba10667f5a43 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
@@ -152,7 +152,10 @@ Info 34   [00:01:20.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 35   [00:01:21.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 36   [00:01:22.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 37   [00:01:23.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/a/tsconfig.json] deleted
 
 PolledWatches::
@@ -224,7 +227,7 @@ Info 48   [00:01:42.000] -----------------------------------------------
 Info 48   [00:01:43.000] Open files: 
 Info 48   [00:01:44.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 48   [00:01:45.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 Info 48   [00:01:48.000] FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
 Info 49   [00:01:49.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
@@ -233,7 +236,10 @@ Info 51   [00:01:51.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 52   [00:01:52.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 53   [00:01:53.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 54   [00:01:54.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+4: /user/username/projects/myproject/c/tsconfig.json
+5: *ensureProjectForOpenFiles*
+6: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/a/tsconfig.json]
 {"compilerOptions":{"composite":true},"files":["index.ts"]}
 
@@ -276,4 +282,4 @@ Info 65   [00:02:13.000] -----------------------------------------------
 Info 65   [00:02:14.000] Open files: 
 Info 65   [00:02:15.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 65   [00:02:16.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
index 1de2ceff243aa..d3579af9e980c 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
@@ -151,7 +151,9 @@ Info 33   [00:01:25.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 34   [00:01:26.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 35   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*
 Info 36   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/b/tsconfig.json]
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../nrefs/*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
 
@@ -260,7 +262,7 @@ Info 52   [00:01:52.000] -----------------------------------------------
 Info 52   [00:01:53.000] Open files: 
 Info 52   [00:01:54.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 52   [00:01:55.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
@@ -304,7 +306,9 @@ Info 52   [00:01:59.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 53   [00:02:00.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 54   [00:02:01.000] Scheduled: *ensureProjectForOpenFiles*
 Info 55   [00:02:02.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/c/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/b/tsconfig.json]
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
 
@@ -376,7 +380,7 @@ Info 70   [00:02:25.000] -----------------------------------------------
 Info 70   [00:02:26.000] Open files: 
 Info 70   [00:02:27.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 70   [00:02:28.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
index 4854c1dafc6bb..bd19609a4333b 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
@@ -151,7 +151,9 @@ Info 33   [00:01:25.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 34   [00:01:26.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 35   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*
 Info 36   [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/c/tsconfig.json]
 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../nrefs/*"]}},"files":["index.ts"],"references":[{"path":"../b"}]}
 
@@ -280,7 +282,7 @@ Info 73   [00:02:13.000] -----------------------------------------------
 Info 73   [00:02:14.000] Open files: 
 Info 73   [00:02:15.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 73   [00:02:16.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
@@ -338,7 +340,9 @@ Info 73   [00:02:20.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 74   [00:02:21.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 75   [00:02:22.000] Scheduled: *ensureProjectForOpenFiles*
 Info 76   [00:02:23.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/c/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/c/tsconfig.json]
 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"files":["index.ts"],"references":[{"path":"../b"}]}
 
@@ -430,7 +434,7 @@ Info 112  [00:03:07.000] -----------------------------------------------
 Info 112  [00:03:08.000] Open files: 
 Info 112  [00:03:09.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 112  [00:03:10.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
index 55fee9a406d84..12f6e3198864f 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
@@ -149,7 +149,9 @@ Info 31   [00:01:18.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 32   [00:01:19.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 33   [00:01:20.000] Scheduled: *ensureProjectForOpenFiles*
 Info 34   [00:01:21.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/index.ts 1:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/b/index.ts]
 import {A} from '@ref/a';
 export const b = new A();export function gFoo() { }
@@ -216,4 +218,4 @@ Info 44   [00:01:39.000] -----------------------------------------------
 Info 44   [00:01:40.000] Open files: 
 Info 44   [00:01:41.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 44   [00:01:42.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
index 3f071800f0d2b..2ab9ac2a52425 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
@@ -161,7 +161,10 @@ Info 43   [00:01:29.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 44   [00:01:30.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 45   [00:01:31.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 46   [00:01:32.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/b/tsconfig.json] deleted
 
 PolledWatches::
@@ -252,7 +255,7 @@ Info 64   [00:01:58.000] -----------------------------------------------
 Info 64   [00:01:59.000] Open files: 
 Info 64   [00:02:00.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 64   [00:02:01.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
@@ -299,7 +302,10 @@ Info 67   [00:02:07.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 68   [00:02:08.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 69   [00:02:09.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 70   [00:02:10.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+4: /user/username/projects/myproject/c/tsconfig.json
+5: *ensureProjectForOpenFiles*
+6: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/b/tsconfig.json]
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"references":[{"path":"../a"}]}
 
@@ -383,7 +389,7 @@ Info 89   [00:02:37.000] -----------------------------------------------
 Info 89   [00:02:38.000] Open files: 
 Info 89   [00:02:39.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 89   [00:02:40.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
index 6773435020830..9256c9e3695db 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
@@ -161,7 +161,10 @@ Info 43   [00:01:29.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 44   [00:01:30.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 45   [00:01:31.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 46   [00:01:32.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/a/tsconfig.json] deleted
 
 PolledWatches::
@@ -237,7 +240,7 @@ Info 59   [00:01:53.000] -----------------------------------------------
 Info 59   [00:01:54.000] Open files: 
 Info 59   [00:01:55.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 59   [00:01:56.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
 
 Info 59   [00:01:59.000] FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
 Info 60   [00:02:00.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
@@ -246,7 +249,10 @@ Info 62   [00:02:02.000] Elapsed:: *ms FileWatcher:: Triggered with /user/userna
 Info 63   [00:02:03.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
 Info 64   [00:02:04.000] Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 Info 65   [00:02:05.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
-Before checking timeout queue length (3) and running
+Before running Timeout callback:: count: 3
+4: /user/username/projects/myproject/c/tsconfig.json
+5: *ensureProjectForOpenFiles*
+6: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
 //// [/user/username/projects/myproject/a/tsconfig.json]
 {"compilerOptions":{"composite":true}}
 
@@ -291,4 +297,4 @@ Info 78   [00:02:26.000] -----------------------------------------------
 Info 78   [00:02:27.000] Open files: 
 Info 78   [00:02:28.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 78   [00:02:29.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (3) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
index b9bf79f3e4f75..99ef9710455f3 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
@@ -157,7 +157,9 @@ Info 39   [00:01:31.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 40   [00:01:32.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 41   [00:01:33.000] Scheduled: *ensureProjectForOpenFiles*
 Info 42   [00:01:34.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/b/tsconfig.json]
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../nrefs/*"]}},"references":[{"path":"../a"}]}
 
@@ -268,7 +270,7 @@ Info 58   [00:01:58.000] -----------------------------------------------
 Info 58   [00:01:59.000] Open files: 
 Info 58   [00:02:00.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 58   [00:02:01.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
@@ -312,7 +314,9 @@ Info 58   [00:02:05.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 59   [00:02:06.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 60   [00:02:07.000] Scheduled: *ensureProjectForOpenFiles*
 Info 61   [00:02:08.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/c/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/b/tsconfig.json]
 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"references":[{"path":"../a"}]}
 
@@ -384,7 +388,7 @@ Info 76   [00:02:31.000] -----------------------------------------------
 Info 76   [00:02:32.000] Open files: 
 Info 76   [00:02:33.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 76   [00:02:34.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
index ae6e3f6449f2a..de92514fb3e39 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
@@ -157,7 +157,9 @@ Info 39   [00:01:31.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 40   [00:01:32.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 41   [00:01:33.000] Scheduled: *ensureProjectForOpenFiles*
 Info 42   [00:01:34.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/c/tsconfig.json]
 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../nrefs/*"]}},"references":[{"path":"../b"}]}
 
@@ -288,7 +290,7 @@ Info 79   [00:02:19.000] -----------------------------------------------
 Info 79   [00:02:20.000] Open files: 
 Info 79   [00:02:21.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 79   [00:02:22.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
@@ -344,7 +346,9 @@ Info 79   [00:02:26.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 80   [00:02:27.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 81   [00:02:28.000] Scheduled: *ensureProjectForOpenFiles*
 Info 82   [00:02:29.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/c/tsconfig.json
+4: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/c/tsconfig.json]
 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"references":[{"path":"../b"}]}
 
@@ -436,7 +440,7 @@ Info 118  [00:03:13.000] -----------------------------------------------
 Info 118  [00:03:14.000] Open files: 
 Info 118  [00:03:15.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 118  [00:03:16.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/c/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
index e9f1800f516c7..e79fd8fa9dbe6 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
@@ -155,7 +155,9 @@ Info 37   [00:01:24.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 38   [00:01:25.000] Scheduled: /user/username/projects/myproject/c/tsconfig.json
 Info 39   [00:01:26.000] Scheduled: *ensureProjectForOpenFiles*
 Info 40   [00:01:27.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/index.ts 1:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/c/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/b/index.ts]
 import {A} from '@ref/a';
 export const b = new A();export function gFoo() { }
@@ -224,4 +226,4 @@ Info 50   [00:01:45.000] -----------------------------------------------
 Info 50   [00:01:46.000] Open files: 
 Info 50   [00:01:47.000] 	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
 Info 50   [00:01:48.000] 		Projects: /user/username/projects/myproject/c/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/reloadProjects/configured-project.js b/tests/baselines/reference/tsserver/reloadProjects/configured-project.js
index 364ce6a868f96..6dcdd43d5f2a4 100644
--- a/tests/baselines/reference/tsserver/reloadProjects/configured-project.js
+++ b/tests/baselines/reference/tsserver/reloadProjects/configured-project.js
@@ -127,7 +127,8 @@ FsWatchesRecursive::
 /user/username/projects/myproject: *new*
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/module1/index.d.ts]
 export function foo(): string;
 
@@ -223,7 +224,8 @@ FsWatchesRecursive::
 /user/username/projects/myproject/node_modules: *new*
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts]
 export function bar(){}
             bar();
@@ -297,7 +299,8 @@ Info 72   [00:02:14.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts] deleted
 
 Before request
diff --git a/tests/baselines/reference/tsserver/reloadProjects/external-project-with-config-file.js b/tests/baselines/reference/tsserver/reloadProjects/external-project-with-config-file.js
index 24392c03157af..15353bcf45a77 100644
--- a/tests/baselines/reference/tsserver/reloadProjects/external-project-with-config-file.js
+++ b/tests/baselines/reference/tsserver/reloadProjects/external-project-with-config-file.js
@@ -179,7 +179,8 @@ FsWatchesRecursive::
 /user/username/projects/myproject:
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/module1/index.d.ts]
 export function foo(): string;
 
@@ -275,7 +276,8 @@ FsWatchesRecursive::
 /user/username/projects/myproject/node_modules: *new*
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts]
 export function bar(){}
             bar();
@@ -349,7 +351,8 @@ Info 76   [00:02:18.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts] deleted
 
 Before request
diff --git a/tests/baselines/reference/tsserver/reloadProjects/external-project.js b/tests/baselines/reference/tsserver/reloadProjects/external-project.js
index 704909c4983f2..c4eb5a214dcc9 100644
--- a/tests/baselines/reference/tsserver/reloadProjects/external-project.js
+++ b/tests/baselines/reference/tsserver/reloadProjects/external-project.js
@@ -139,7 +139,8 @@ FsWatches *deleted*::
 /user/username/projects/myproject/file1.ts:
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/module1/index.d.ts]
 export function foo(): string;
 
@@ -216,7 +217,8 @@ FsWatchesRecursive::
 /user/username/projects/myproject/node_modules: *new*
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts]
 export function bar(){}
             bar();
@@ -275,7 +277,8 @@ Info 63   [00:02:03.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts] deleted
 
 Before request
diff --git a/tests/baselines/reference/tsserver/reloadProjects/inferred-project.js b/tests/baselines/reference/tsserver/reloadProjects/inferred-project.js
index 9dd9ffe841e49..784559a894072 100644
--- a/tests/baselines/reference/tsserver/reloadProjects/inferred-project.js
+++ b/tests/baselines/reference/tsserver/reloadProjects/inferred-project.js
@@ -129,7 +129,8 @@ FsWatches::
 /a/lib/lib.d.ts: *new*
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/module1/index.d.ts]
 export function foo(): string;
 
@@ -211,7 +212,8 @@ FsWatchesRecursive::
 /user/username/projects/myproject/node_modules: *new*
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts]
 export function bar(){}
             bar();
@@ -270,7 +272,8 @@ Info 65   [00:02:05.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/file2.ts] deleted
 
 Before request
diff --git a/tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js b/tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js
index 68cec07805e81..6080629f8414a 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js
@@ -112,7 +112,7 @@ Info 52   [00:01:36.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 53   [00:01:37.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Info 54   [00:01:38.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 55   [00:01:39.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/src/file1.ts] file changed its modified time
 
 PolledWatches::
@@ -135,4 +135,4 @@ FsWatchesRecursive::
 /user/username/projects/myproject/src: *new*
   {}
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js b/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js
index 9bbad0f01cadb..8a69e046b1da9 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/disable-suggestion-diagnostics.js
@@ -120,8 +120,6 @@ Info 15   [00:01:06.000] response:
     }
 After request
 
-Checking timeout queue length: 0
-
 Before request
 
 Info 16   [00:01:07.000] request:
@@ -142,16 +140,18 @@ Info 17   [00:01:08.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 18   [00:01:09.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a.js","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 19   [00:01:10.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a.js","diagnostics":[]}}
 Info 20   [00:01:11.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js
index f0428410ec9f0..903f057eaa786 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js
@@ -184,7 +184,9 @@ Info 97   [00:02:44.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 98   [00:02:45.000] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
 Info 99   [00:02:46.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 100  [00:02:47.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /user/username/projects/myproject/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/product/src/file1.ts]
 import { module1 } from "module1";import { module2 } from "module2";import { module1 } from "module1";import { module2 } from "module2";
 
@@ -263,4 +265,4 @@ Info 118  [00:03:13.000] -----------------------------------------------
 Info 118  [00:03:14.000] Open files: 
 Info 118  [00:03:15.000] 	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
 Info 118  [00:03:16.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js
index 6869917738401..f499997a264d6 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js
@@ -124,7 +124,9 @@ Info 55   [00:01:44.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 56   [00:01:45.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 57   [00:01:46.000] Scheduled: *ensureProjectForOpenFiles*
 Info 58   [00:01:47.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/src/file1.ts]
 import { module1 } from "module1";import { module2 } from "module2";import { module1 } from "module1";import { module2 } from "module2";
 
@@ -187,4 +189,4 @@ Info 72   [00:02:09.000] -----------------------------------------------
 Info 72   [00:02:10.000] Open files: 
 Info 72   [00:02:11.000] 	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
 Info 72   [00:02:12.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js
index a448ef5a693d1..ee66169e97da1 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js
@@ -198,7 +198,9 @@ Info 125  [00:03:10.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 126  [00:03:11.000] Scheduled: /dev/null/inferredProject1*, Cancelled earlier one
 Info 127  [00:03:12.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 128  [00:03:13.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /dev/null/inferredProject1*
+6: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/product/src/file1.ts]
 import "./feature/file2"; import "../test/file4"; import "../test/src/file3"; import { module1 } from "module1";import { module2 } from "module2";import { module1 } from "module1";import { module2 } from "module2";
 
@@ -298,4 +300,4 @@ Info 149  [00:03:42.000] -----------------------------------------------
 Info 149  [00:03:43.000] Open files: 
 Info 149  [00:03:44.000] 	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
 Info 149  [00:03:45.000] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js b/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js
index 8c1bffbdb3360..ea5caf75eeb24 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js
@@ -100,25 +100,29 @@ Info 18   [00:00:41.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 19   [00:00:42.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/projects/temp/a.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 20   [00:00:43.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a/b/projects/temp/a.ts","diagnostics":[{"start":{"line":1,"offset":20},"end":{"line":1,"offset":25},"text":"Cannot find module 'pad' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 21   [00:00:44.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/a/b/projects/temp/a.ts","diagnostics":[]}}
 Info 22   [00:00:45.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 23   [00:00:51.000] DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info 24   [00:00:52.000] Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation
@@ -147,7 +151,10 @@ Info 46   [00:01:16.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/pr
 Info 47   [00:01:17.000] DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types/pad :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info 48   [00:01:18.000] Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation, Cancelled earlier one
 Info 49   [00:01:19.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types/pad :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+11: /dev/null/inferredProject1*
+12: *ensureProjectForOpenFiles*
+14: /dev/null/inferredProject1*FailedLookupInvalidation
 //// [/a/b/projects/temp/node_modules/@types/pad/index.d.ts]
 export = pad;declare function pad(length: number, text: string, char ?: string): string;
 
@@ -196,9 +203,11 @@ Info 57   [00:01:28.000] 	Files (3)
 	  Root file specified for compilation
 
 Info 58   [00:01:29.000] -----------------------------------------------
-After running timeout callbacks
+After running Timeout callback:: count: 1
+15: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+15: *ensureProjectForOpenFiles*
 
 Info 59   [00:01:30.000] Running: *ensureProjectForOpenFiles*
 Info 60   [00:01:31.000] Before ensureProjectForOpenFiles:
@@ -220,16 +229,20 @@ Info 62   [00:01:44.000] 		Projects: /dev/null/inferredProject1*
 Info 62   [00:01:45.000] got projects updated in background, updating diagnostics for /a/b/projects/temp/a.ts
 Info 63   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/projects/temp/a.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+16: checkOne
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+16: checkOne
 
 Info 64   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/projects/temp/a.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 65   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a/b/projects/temp/a.ts","diagnostics":[]}}
-After running immediate callbacks
+After running Immedidate callback:: count: 1
+4: suggestionCheck
diff --git a/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js
index 802da5cba8050..bb9f189f114b2 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js
@@ -168,7 +168,9 @@ Info 78   [00:02:17.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 79   [00:02:18.000] Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
 Info 80   [00:02:19.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 81   [00:02:20.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /user/username/projects/myproject/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/product/src/file1.ts]
 import { module1 } from "./module1";import { module2 } from "../module2";import { module1 } from "./module1";import { module2 } from "../module2";
 
@@ -247,4 +249,4 @@ Info 99   [00:02:46.000] -----------------------------------------------
 Info 99   [00:02:47.000] Open files: 
 Info 99   [00:02:48.000] 	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
 Info 99   [00:02:49.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js
index 2d424dc733a2e..a9d3f01ac641f 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js
@@ -108,7 +108,9 @@ Info 35   [00:01:16.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 36   [00:01:17.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 37   [00:01:18.000] Scheduled: *ensureProjectForOpenFiles*
 Info 38   [00:01:19.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/src/file1.ts]
 import { module1 } from "./module1";import { module2 } from "../module2";import { module1 } from "./module1";import { module2 } from "../module2";
 
@@ -169,4 +171,4 @@ Info 52   [00:01:41.000] -----------------------------------------------
 Info 52   [00:01:42.000] Open files: 
 Info 52   [00:01:43.000] 	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
 Info 52   [00:01:44.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js
index 2ce3d2f5e3442..f486adc6d629e 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-configured-projects.js
@@ -114,7 +114,9 @@ Info 30   [00:00:52.000] DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :
 Info 31   [00:00:53.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 32   [00:00:54.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 33   [00:00:55.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile1.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /a/b/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function bar() { };
 
@@ -175,7 +177,7 @@ Info 48   [00:01:18.000] -----------------------------------------------
 Info 48   [00:01:19.000] Open files: 
 Info 48   [00:01:20.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 48   [00:01:21.000] 		Projects: /a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
@@ -248,7 +250,10 @@ Info 65   [00:01:42.000] DirectoryWatcher:: Triggered with /a/b/moduleFile.ts ::
 Info 66   [00:01:43.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 67   [00:01:44.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Info 68   [00:01:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+12: /a/b/tsconfig.jsonFailedLookupInvalidation
+13: /a/b/tsconfig.json
+14: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile.ts]
 export function bar() { };
 
@@ -279,7 +284,9 @@ FsWatchesRecursive::
 Info 69   [00:01:46.000] Running: /a/b/tsconfig.jsonFailedLookupInvalidation
 Info 70   [00:01:47.000] Scheduled: /a/b/tsconfig.json, Cancelled earlier one
 Info 71   [00:01:48.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /a/b/tsconfig.json
+16: *ensureProjectForOpenFiles*
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js
index 12062333bc73b..944644bca16f4 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/renaming-module-should-restore-the-states-for-inferred-projects.js
@@ -83,7 +83,9 @@ Info 17   [00:00:35.000] FileWatcher:: Close:: WatchInfo: /a/b/moduleFile.ts 500
 Info 18   [00:00:36.000] Scheduled: /dev/null/inferredProject1*
 Info 19   [00:00:37.000] Scheduled: *ensureProjectForOpenFiles*
 Info 20   [00:00:38.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/moduleFile.ts 2:: WatchInfo: /a/b/moduleFile.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 //// [/a/b/moduleFile1.ts]
 export function bar() { };
 
@@ -132,7 +134,7 @@ Info 34   [00:01:02.000] -----------------------------------------------
 Info 34   [00:01:03.000] Open files: 
 Info 34   [00:01:04.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 34   [00:01:05.000] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
@@ -184,7 +186,8 @@ Info 38   [00:01:11.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/mo
 Info 39   [00:01:14.000] DirectoryWatcher:: Triggered with /a/b/moduleFile.ts :: WatchInfo: /a/b 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info 40   [00:01:15.000] Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation, Cancelled earlier one
 Info 41   [00:01:16.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile.ts :: WatchInfo: /a/b 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+4: /dev/null/inferredProject1*FailedLookupInvalidation
 //// [/a/b/moduleFile.ts]
 export function bar() { };
 
@@ -193,7 +196,9 @@ export function bar() { };
 Info 42   [00:01:17.000] Running: /dev/null/inferredProject1*FailedLookupInvalidation
 Info 43   [00:01:18.000] Scheduled: /dev/null/inferredProject1*
 Info 44   [00:01:19.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+5: /dev/null/inferredProject1*
+6: *ensureProjectForOpenFiles*
 
 Before request
 
@@ -217,7 +222,9 @@ Info 46   [00:01:21.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /dev/null/inferredProject1*
+6: *ensureProjectForOpenFiles*
 
 Info 47   [00:01:22.000] Running: /dev/null/inferredProject1*
 Info 48   [00:01:23.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -256,7 +263,7 @@ Info 61   [00:01:44.000] -----------------------------------------------
 Info 61   [00:01:45.000] Open files: 
 Info 61   [00:01:46.000] 	FileName: /a/b/file1.ts ProjectRootPath: undefined
 Info 61   [00:01:47.000] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js b/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js
index 1213119ebbb8d..b2b00d71d5a67 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/should-remove-the-module-not-found-error.js
@@ -94,7 +94,8 @@ After request
 Info 19   [00:00:36.000] DirectoryWatcher:: Triggered with /a/b/moduleFile.ts :: WatchInfo: /a/b 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info 20   [00:00:37.000] Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation
 Info 21   [00:00:38.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/moduleFile.ts :: WatchInfo: /a/b 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: /dev/null/inferredProject1*FailedLookupInvalidation
 //// [/a/b/moduleFile.ts]
 export function bar() { };
 
@@ -102,7 +103,9 @@ export function bar() { };
 Info 22   [00:00:39.000] Running: /dev/null/inferredProject1*FailedLookupInvalidation
 Info 23   [00:00:40.000] Scheduled: /dev/null/inferredProject1*
 Info 24   [00:00:41.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+2: /dev/null/inferredProject1*
+3: *ensureProjectForOpenFiles*
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js b/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js
index 167db4b64c79c..7023f3cab3e98 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/suggestion-diagnostics.js
@@ -93,8 +93,6 @@ PolledWatches::
 /node_modules: *new*
   {"pollingInterval":500}
 
-Checking timeout queue length: 0
-
 Before request
 
 Info 11   [00:01:00.000] request:
@@ -115,22 +113,26 @@ Info 12   [00:01:01.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 13   [00:01:02.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a.js","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 14   [00:01:03.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a.js","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 15   [00:01:04.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/a.js","diagnostics":[{"start":{"line":1,"offset":12},"end":{"line":1,"offset":13},"text":"'p' is declared but its value is never read.","code":6133,"category":"suggestion","reportsUnnecessary":true}]}}
 Info 16   [00:01:05.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/suppressed-diagnostic-events.js b/tests/baselines/reference/tsserver/resolutionCache/suppressed-diagnostic-events.js
index 2840be5b8d05b..e449694e83d92 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/suppressed-diagnostic-events.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/suppressed-diagnostic-events.js
@@ -46,7 +46,8 @@ PolledWatches::
 /a/lib/lib.d.ts: *new*
   {"pollingInterval":500}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 Before request
 
@@ -70,7 +71,8 @@ Info 13   [00:00:24.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 Before request
 
@@ -92,4 +94,5 @@ Info 16   [00:00:27.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-as-part-of-wild-card-directories-in-config-project.js b/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-as-part-of-wild-card-directories-in-config-project.js
index ac3398e68e290..f497b1df68d7f 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-as-part-of-wild-card-directories-in-config-project.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-as-part-of-wild-card-directories-in-config-project.js
@@ -69,7 +69,8 @@ Info 20   [00:00:49.000] -----------------------------------------------
 Info 20   [00:00:50.000] Open files: 
 Info 20   [00:00:51.000] 	FileName: /user/username/projects/myproject/test.ts ProjectRootPath: undefined
 Info 20   [00:00:52.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types: *new*
@@ -108,7 +109,8 @@ Info 37   [00:01:16.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/u
 Info 38   [00:01:17.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 39   [00:01:18.000] Project: /user/username/projects/myproject/tsconfig.json Detected ignored path: /user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
 Info 40   [00:01:19.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts]
 {"something":10}
 
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-in-inferred-project-for-failed-lookup/closed-script-infos.js b/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-in-inferred-project-for-failed-lookup/closed-script-infos.js
index 75143785af824..9aaf4822a9c13 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-in-inferred-project-for-failed-lookup/closed-script-infos.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-watching-node_modules-in-inferred-project-for-failed-lookup/closed-script-infos.js
@@ -56,7 +56,8 @@ Info 17   [00:00:44.000] -----------------------------------------------
 Info 17   [00:00:45.000] Open files: 
 Info 17   [00:00:46.000] 	FileName: /user/username/projects/myproject/test.ts ProjectRootPath: undefined
 Info 17   [00:00:47.000] 		Projects: /dev/null/inferredProject1*
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/tsconfig.json: *new*
@@ -86,7 +87,8 @@ Info 25   [00:01:02.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 26   [00:01:03.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
 Info 27   [00:01:04.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Info 28   [00:01:05.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/user/username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts]
 {"something":10}
 
diff --git a/tests/baselines/reference/tsserver/resolutionCache/works-correctly-when-typings-are-added-or-removed.js b/tests/baselines/reference/tsserver/resolutionCache/works-correctly-when-typings-are-added-or-removed.js
index 8ee484d141b5f..112f0d56ef328 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/works-correctly-when-typings-are-added-or-removed.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/works-correctly-when-typings-are-added-or-removed.js
@@ -70,7 +70,10 @@ Info 33   [00:00:59.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/no
 Info 34   [00:01:00.000] DirectoryWatcher:: Triggered with /a/b/node_modules/@types/lib1/index.d.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
 Info 35   [00:01:01.000] Project: /a/b/tsconfig.json Detected excluded file: /a/b/node_modules/@types/lib1/index.d.ts
 Info 36   [00:01:02.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/node_modules/@types/lib1/index.d.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+4: /a/b/tsconfig.json
+5: *ensureProjectForOpenFiles*
+6: /a/b/tsconfig.jsonFailedLookupInvalidation
 //// [/a/b/node_modules/@types/lib1/index.d.ts] deleted
 
 PolledWatches::
@@ -118,7 +121,7 @@ Info 46   [00:01:20.000] -----------------------------------------------
 Info 46   [00:01:21.000] Open files: 
 Info 46   [00:01:22.000] 	FileName: /a/b/app.ts ProjectRootPath: undefined
 Info 46   [00:01:23.000] 		Projects: /a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Info 46   [00:01:27.000] DirectoryWatcher:: Triggered with /a/b/node_modules/@types/lib2 :: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
 Info 47   [00:01:28.000] Scheduled: /a/b/tsconfig.json
@@ -142,7 +145,10 @@ Info 64   [00:01:47.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/no
 Info 65   [00:01:48.000] DirectoryWatcher:: Triggered with /a/b/node_modules/@types/lib2/index.d.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
 Info 66   [00:01:49.000] Project: /a/b/tsconfig.json Detected excluded file: /a/b/node_modules/@types/lib2/index.d.ts
 Info 67   [00:01:50.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/node_modules/@types/lib2/index.d.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+11: /a/b/tsconfig.json
+12: *ensureProjectForOpenFiles*
+14: /a/b/tsconfig.jsonFailedLookupInvalidation
 //// [/a/b/node_modules/@types/lib2/index.d.ts]
 export let b: number
 
@@ -181,4 +187,4 @@ Info 79   [00:02:10.000] -----------------------------------------------
 Info 79   [00:02:11.000] Open files: 
 Info 79   [00:02:12.000] 	FileName: /a/b/app.ts ProjectRootPath: undefined
 Info 79   [00:02:13.000] 		Projects: /a/b/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js
index 40c8e3fec1eec..e91ec0b666016 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js
@@ -154,25 +154,29 @@ Info 39   [00:01:24.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 40   [00:01:25.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 41   [00:01:26.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 42   [00:01:27.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 43   [00:01:28.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 44   [00:01:33.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 45   [00:01:34.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
@@ -185,7 +189,8 @@ Info 51   [00:01:41.000] Scheduled: /users/username/projects/myproject/javascrip
 Info 52   [00:01:42.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 53   [00:01:44.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft/recognizers-text :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 54   [00:01:45.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft/recognizers-text :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+4: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 //// [/users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft/recognizers-text] symlink(/users/username/projects/myproject/javascript/packages/recognizers-text)
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts]
 export class C { method(): number; }
@@ -226,9 +231,13 @@ FsWatchesRecursive::
 Info 55   [00:01:53.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Info 56   [00:01:54.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 57   [00:01:55.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+5: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+6: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+6: *ensureProjectForOpenFiles*
 
 Info 58   [00:01:56.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 59   [00:01:57.000] Starting updateGraphWorker: Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
@@ -276,7 +285,8 @@ Info 75   [00:02:24.000] 		Projects: /users/username/projects/myproject/javascri
 Info 75   [00:02:25.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 76   [00:02:26.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+7: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -332,31 +342,37 @@ Info 78   [00:02:28.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+8: checkOne
 
 Info 79   [00:02:29.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 80   [00:02:30.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 81   [00:02:31.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 82   [00:02:32.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 83   [00:02:36.000] FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 1:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 2000 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Config file
 Info 84   [00:02:37.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 85   [00:02:38.000] Scheduled: *ensureProjectForOpenFiles*
 Info 86   [00:02:39.000] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 1:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 2000 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+9: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+10: *ensureProjectForOpenFiles*
 //// [/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json]
 {"include":["src"],"compilerOptions":{"resolveJsonModule":true}}
 
@@ -433,7 +449,8 @@ Info 127  [00:03:31.000] 		Projects: /users/username/projects/myproject/javascri
 Info 127  [00:03:32.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 128  [00:03:33.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+11: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -479,8 +496,9 @@ FsWatchesRecursive *deleted*::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules:
   {}
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+11: checkOne
 
 Info 129  [00:03:34.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
index ec24c38ad2a78..48d3a01e2977f 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
@@ -158,36 +158,40 @@ Info 40   [00:01:31.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 41   [00:01:32.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 42   [00:01:33.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 43   [00:01:34.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 44   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts]
 export class C { method(): number; }
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -209,22 +213,26 @@ Info 46   [00:01:44.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+2: checkOne
 
 Info 47   [00:01:45.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 48   [00:01:46.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 49   [00:01:47.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 50   [00:01:48.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-recompiles-after-deleting-generated-folders.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-recompiles-after-deleting-generated-folders.js
index 56fa5cccd2a8c..5795087772fe7 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-recompiles-after-deleting-generated-folders.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-recompiles-after-deleting-generated-folders.js
@@ -155,32 +155,38 @@ Info 35   [00:01:32.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 36   [00:01:33.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 37   [00:01:34.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 38   [00:01:35.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 39   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 40   [00:01:38.000] FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 2:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 500 undefined WatchType: Closed Script info
 Info 41   [00:01:39.000] FileWatcher:: Close:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 500 undefined WatchType: Closed Script info
 Info 42   [00:01:40.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 43   [00:01:41.000] Scheduled: *ensureProjectForOpenFiles*
 Info 44   [00:01:42.000] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 2:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+2: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+3: *ensureProjectForOpenFiles*
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts] deleted
 
 PolledWatches::
@@ -252,7 +258,8 @@ Info 60   [00:02:11.000] 		Projects: /users/username/projects/myproject/javascri
 Info 60   [00:02:12.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 61   [00:02:13.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+4: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -284,11 +291,12 @@ FsWatchesRecursive::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules:
   {}
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+4: checkOne
 
 Info 62   [00:02:14.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -310,36 +318,40 @@ Info 64   [00:02:16.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+5: checkOne
 
 Info 65   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: semanticCheck
 
 Info 66   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+5: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: suggestionCheck
 
 Info 67   [00:02:19.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 68   [00:02:20.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts]
 export class C { method(): number; }
 
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 0
 
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -361,22 +373,26 @@ Info 70   [00:02:28.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+6: checkOne
 
 Info 71   [00:02:29.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: semanticCheck
 
 Info 72   [00:02:30.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+7: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: suggestionCheck
 
 Info 73   [00:02:31.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 74   [00:02:32.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
index 08a71c90224e0..f2144e380da56 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
@@ -173,25 +173,29 @@ Info 44   [00:01:29.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:30.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:31.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:32.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 48   [00:01:33.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 49   [00:01:38.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 50   [00:01:39.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
@@ -211,7 +215,8 @@ Info 63   [00:01:59.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/
 Info 64   [00:02:02.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 65   [00:02:03.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Info 66   [00:02:04.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+5: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 //// [/users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft/recognizers-text] symlink(/users/username/projects/myproject/javascript/packages/recognizers-text)
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts]
 export class C { method(): number; }
@@ -258,9 +263,13 @@ FsWatchesRecursive::
 Info 67   [00:02:05.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Info 68   [00:02:06.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 69   [00:02:07.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+6: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+7: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+6: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+7: *ensureProjectForOpenFiles*
 
 Info 70   [00:02:08.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 71   [00:02:09.000] Starting updateGraphWorker: Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
@@ -313,7 +322,8 @@ Info 92   [00:02:41.000] 		Projects: /users/username/projects/myproject/javascri
 Info 92   [00:02:42.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 93   [00:02:43.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+8: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -375,31 +385,37 @@ Info 95   [00:02:45.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+9: checkOne
 
 Info 96   [00:02:46.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 97   [00:02:47.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 98   [00:02:48.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 99   [00:02:49.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 100  [00:02:53.000] FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 1:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 2000 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Config file
 Info 101  [00:02:54.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 102  [00:02:55.000] Scheduled: *ensureProjectForOpenFiles*
 Info 103  [00:02:56.000] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 1:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json 2000 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Config file
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+10: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+11: *ensureProjectForOpenFiles*
 //// [/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json]
 {"compilerOptions":{"rootDir":"src","baseUrl":"./","paths":{"@microsoft/*":["../*"]},"resolveJsonModule":true},"include":["src"]}
 
@@ -480,7 +496,8 @@ Info 140  [00:03:44.000] 		Projects: /users/username/projects/myproject/javascri
 Info 140  [00:03:45.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 141  [00:03:46.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+12: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -524,8 +541,9 @@ FsWatchesRecursive::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/src:
   {}
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+12: checkOne
 
 Info 142  [00:03:47.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
index 9e326a520cdeb..7628cb4fdbc21 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
@@ -174,25 +174,29 @@ Info 44   [00:01:35.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 45   [00:01:36.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 46   [00:01:37.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 47   [00:01:38.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 48   [00:01:39.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 49   [00:01:43.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 50   [00:01:44.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
@@ -201,7 +205,8 @@ Info 52   [00:01:48.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/
 Info 53   [00:01:51.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 54   [00:01:52.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Info 55   [00:01:53.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+2: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts]
 export class C { method(): number; }
 
@@ -209,9 +214,13 @@ export class C { method(): number; }
 Info 56   [00:01:54.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Info 57   [00:01:55.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 58   [00:01:56.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+3: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+4: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+4: *ensureProjectForOpenFiles*
 
 Info 59   [00:01:57.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 60   [00:01:58.000] Starting updateGraphWorker: Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
@@ -264,7 +273,8 @@ Info 81   [00:02:30.000] 		Projects: /users/username/projects/myproject/javascri
 Info 81   [00:02:31.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 82   [00:02:32.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+5: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -326,22 +336,26 @@ Info 84   [00:02:34.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+6: checkOne
 
 Info 85   [00:02:35.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+3: semanticCheck
 
 Info 86   [00:02:36.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+4: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: suggestionCheck
 
 Info 87   [00:02:37.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 88   [00:02:38.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js
index 075b89ca4496c..7c552ca9725db 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js
@@ -161,32 +161,38 @@ Info 33   [00:01:30.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: checkOne
 
 Info 34   [00:01:31.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+1: semanticCheck
 
 Info 35   [00:01:32.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+2: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+2: suggestionCheck
 
 Info 36   [00:01:33.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 37   [00:01:34.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 38   [00:01:36.000] FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 2:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 500 undefined WatchType: Closed Script info
 Info 39   [00:01:37.000] FileWatcher:: Close:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 500 undefined WatchType: Closed Script info
 Info 40   [00:01:38.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 41   [00:01:39.000] Scheduled: *ensureProjectForOpenFiles*
 Info 42   [00:01:40.000] Elapsed:: *ms FileWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 2:: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts 500 undefined WatchType: Closed Script info
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+2: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+3: *ensureProjectForOpenFiles*
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts] deleted
 
 PolledWatches::
@@ -264,7 +270,8 @@ Info 64   [00:02:15.000] 		Projects: /users/username/projects/myproject/javascri
 Info 64   [00:02:16.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 65   [00:02:17.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+4: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -300,11 +307,12 @@ FsWatchesRecursive::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules: *new*
   {}
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+4: checkOne
 
 Info 66   [00:02:18.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -326,25 +334,29 @@ Info 68   [00:02:20.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+5: checkOne
 
 Info 69   [00:02:21.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+4: semanticCheck
 
 Info 70   [00:02:22.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":46},"text":"Cannot find module '@microsoft/recognizers-text' or its corresponding type declarations.","code":2307,"category":"error"}]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+5: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+5: suggestionCheck
 
 Info 71   [00:02:23.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 72   [00:02:24.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
 
 Info 73   [00:02:29.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 74   [00:02:30.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
@@ -353,7 +365,8 @@ Info 76   [00:02:33.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/
 Info 77   [00:02:35.000] DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Info 78   [00:02:36.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Info 79   [00:02:37.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-text 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+6: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 //// [/users/username/projects/myproject/javascript/packages/recognizers-text/dist/types/recognizers-text.d.ts]
 export class C { method(): number; }
 
@@ -361,9 +374,13 @@ export class C { method(): number; }
 Info 80   [00:02:38.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Info 81   [00:02:39.000] Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 82   [00:02:40.000] Scheduled: *ensureProjectForOpenFiles*
-After running timeout callbacks
+After running Timeout callback:: count: 2
+7: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+7: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
+8: *ensureProjectForOpenFiles*
 
 Info 83   [00:02:41.000] Running: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
 Info 84   [00:02:42.000] Starting updateGraphWorker: Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json
@@ -416,7 +433,8 @@ Info 105  [00:03:14.000] 		Projects: /users/username/projects/myproject/javascri
 Info 105  [00:03:15.000] got projects updated in background, updating diagnostics for /users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts
 Info 106  [00:03:16.000] event:
     {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts"]}}
-After running timeout callbacks
+After running Timeout callback:: count: 1
+9: checkOne
 
 PolledWatches::
 /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@types:
@@ -478,22 +496,26 @@ Info 108  [00:03:18.000] response:
     }
 After request
 
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+10: checkOne
 
 Info 109  [00:03:19.000] event:
     {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+6: semanticCheck
 
 Info 110  [00:03:20.000] event:
     {"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 1
+7: suggestionCheck
 
-Before running immediate callbacks and checking length (1)
+Before running Immedidate callback:: count: 1
+7: suggestionCheck
 
 Info 111  [00:03:21.000] event:
     {"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts","diagnostics":[]}}
 Info 112  [00:03:22.000] event:
     {"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":4}}
-After running immediate callbacks and checking length (1)
+After running Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js b/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js
index 726b102f317c5..907f9a4edcb13 100644
--- a/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js
+++ b/tests/baselines/reference/tsserver/syntaxOperations/file-is-removed-and-added-with-different-content.js
@@ -93,7 +93,9 @@ Info 18   [00:00:47.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 19   [00:00:48.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 20   [00:00:49.000] Scheduled: *ensureProjectForOpenFiles*
 Info 21   [00:00:50.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/unitTest1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/unitTest1.ts]
 import assert = require('assert');
 
@@ -147,7 +149,7 @@ Info 34   [00:01:11.000] -----------------------------------------------
 Info 34   [00:01:12.000] Open files: 
 Info 34   [00:01:13.000] 	FileName: /user/username/projects/myproject/app.ts ProjectRootPath: undefined
 Info 34   [00:01:14.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -330,10 +332,10 @@ After request
 
 Info 41   [00:01:31.000] DirectoryWatcher:: Triggered with /user/username/projects/myproject/unitTest1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Info 42   [00:01:32.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/unitTest1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before checking timeout queue length (0) and running
+Before running Timeout callback:: count: 0
 //// [/user/username/projects/myproject/unitTest1.ts] deleted
 
-After checking timeout queue length (0) and running
+After running Timeout callback:: count: 0
 
 Before request
 
@@ -361,7 +363,9 @@ Info 46   [00:01:42.000] response:
     }
 After request
 
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /user/username/projects/myproject/tsconfig.json
+4: *ensureProjectForOpenFiles*
 
 Info 47   [00:01:43.000] Running: /user/username/projects/myproject/tsconfig.json
 Info 48   [00:01:44.000] Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
@@ -397,7 +401,7 @@ Info 58   [00:02:02.000] -----------------------------------------------
 Info 58   [00:02:03.000] Open files: 
 Info 58   [00:02:04.000] 	FileName: /user/username/projects/myproject/app.ts ProjectRootPath: undefined
 Info 58   [00:02:05.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -421,7 +425,9 @@ Info 58   [00:02:08.000] DirectoryWatcher:: Triggered with /user/username/projec
 Info 59   [00:02:09.000] Scheduled: /user/username/projects/myproject/tsconfig.json
 Info 60   [00:02:10.000] Scheduled: *ensureProjectForOpenFiles*
 Info 61   [00:02:11.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/unitTest1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /user/username/projects/myproject/tsconfig.json
+6: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/unitTest1.ts]
 import assert = require('assert');
 
@@ -473,7 +479,7 @@ Info 74   [00:02:32.000] -----------------------------------------------
 Info 74   [00:02:33.000] Open files: 
 Info 74   [00:02:34.000] 	FileName: /user/username/projects/myproject/app.ts ProjectRootPath: undefined
 Info 74   [00:02:35.000] 		Projects: /user/username/projects/myproject/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js b/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
index 4d6b3ca6ab526..b8de029a8bac4 100644
--- a/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
+++ b/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
@@ -142,7 +142,9 @@ Info 24   [00:01:10.000] FileWatcher:: Triggered with /user/username/projects/my
 Info 25   [00:01:11.000] Scheduled: /user/username/projects/myproject/test/tsconfig.json
 Info 26   [00:01:12.000] Scheduled: *ensureProjectForOpenFiles*
 Info 27   [00:01:13.000] Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/lib/@app/lib/index.d.ts 1:: WatchInfo: /user/username/projects/myproject/lib/@app/lib/index.d.ts 500 undefined WatchType: Closed Script info
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /user/username/projects/myproject/test/tsconfig.json
+2: *ensureProjectForOpenFiles*
 //// [/user/username/projects/myproject/lib/@app/lib/index.d.ts]
 /// <reference types="UpperCasePackage" />
 declare class TestLib {
@@ -180,4 +182,4 @@ Info 37   [00:01:31.000] -----------------------------------------------
 Info 37   [00:01:32.000] Open files: 
 Info 37   [00:01:33.000] 	FileName: /user/username/projects/myproject/test/test.ts ProjectRootPath: undefined
 Info 37   [00:01:34.000] 		Projects: /user/username/projects/myproject/test/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js b/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js
index c3eb6397126fc..1573f216e6a55 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/cached-unresolved-typings-are-not-recomputed-if-program-structure-did-not-change.js
@@ -125,7 +125,8 @@ Info 16   [00:01:06.000] response:
     }
 After request
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 Info 17   [00:01:07.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info 18   [00:01:08.000] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
index 202a530b8f5cb..57359b5d14dcb 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
@@ -202,7 +202,9 @@ Info 49   [00:02:00.000] Scheduled: /jsconfig.json, Cancelled earlier one
 Info 50   [00:02:01.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:02:02.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/jsconfig.json","packagesToInstall":["@types/jquery@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+13: /jsconfig.json
+14: *ensureProjectForOpenFiles*
 
 Info 51   [00:02:03.000] Running: /jsconfig.json
 Info 52   [00:02:04.000] Starting updateGraphWorker: Project: /jsconfig.json
@@ -249,4 +251,4 @@ Info 60   [00:02:32.000] -----------------------------------------------
 Info 60   [00:02:33.000] Open files: 
 Info 60   [00:02:34.000] 	FileName: /app.js ProjectRootPath: undefined
 Info 60   [00:02:35.000] 		Projects: /jsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
index 117135b1d205f..9263bc4e66b95 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
@@ -153,7 +153,9 @@ Info 16   [00:01:26.000] Scheduled: /a/b/tsconfig.json
 Info 17   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:28.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/a/b/tsconfig.json","packagesToInstall":["@types/jquery@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/b/tsconfig.json
+2: *ensureProjectForOpenFiles*
 
 Info 18   [00:01:29.000] Running: /a/b/tsconfig.json
 Info 19   [00:01:30.000] Starting updateGraphWorker: Project: /a/b/tsconfig.json
@@ -199,4 +201,4 @@ Info 27   [00:01:57.000] -----------------------------------------------
 Info 27   [00:01:58.000] Open files: 
 Info 27   [00:01:59.000] 	FileName: /a/b/app.js ProjectRootPath: undefined
 Info 27   [00:02:00.000] 		Projects: /a/b/tsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js
index 058b3d41cad00..109ed346de1e3 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-bower.js
@@ -202,7 +202,9 @@ Info 49   [00:01:55.000] Scheduled: /jsconfig.json, Cancelled earlier one
 Info 50   [00:01:56.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:01:57.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/jsconfig.json","packagesToInstall":["@types/jquery@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+13: /jsconfig.json
+14: *ensureProjectForOpenFiles*
 
 Info 51   [00:01:58.000] Running: /jsconfig.json
 Info 52   [00:01:59.000] Starting updateGraphWorker: Project: /jsconfig.json
@@ -248,4 +250,4 @@ Info 60   [00:02:26.000] -----------------------------------------------
 Info 60   [00:02:27.000] Open files: 
 Info 60   [00:02:28.000] 	FileName: /app.js ProjectRootPath: undefined
 Info 60   [00:02:29.000] 		Projects: /jsconfig.json
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js
index 33d7c01a9ab61..5fd8f93903cf8 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types-has-import.js
@@ -243,7 +243,9 @@ Info 54   [00:02:11.000] Scheduled: /jsconfig.json, Cancelled earlier one
 Info 55   [00:02:12.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:02:13.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/jsconfig.json","packagesToInstall":["@types/jquery@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+13: /jsconfig.json
+14: *ensureProjectForOpenFiles*
 
 Info 56   [00:02:14.000] Running: /jsconfig.json
 Info 57   [00:02:15.000] Starting updateGraphWorker: Project: /jsconfig.json
@@ -278,7 +280,9 @@ TI:: [00:02:32.000] Sending response:
 Info 64   [00:02:33.000] Scheduled: /jsconfig.json
 Info 65   [00:02:34.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:02:35.000] No new typings were requested as a result of typings discovery
-After running timeout callbacks
+After running Timeout callback:: count: 2
+15: /jsconfig.json
+16: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js
index c1508816171b1..02e0ef29511ad 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-empty-types.js
@@ -202,7 +202,9 @@ Info 46   [00:01:50.000] -----------------------------------------------
 Info 46   [00:01:51.000] Open files: 
 Info 46   [00:01:52.000] 	FileName: /app.js ProjectRootPath: undefined
 Info 46   [00:01:53.000] 		Projects: /jsconfig.json
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /jsconfig.json
+6: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /a/lib/lib.d.ts:
@@ -248,4 +250,4 @@ Info 50   [00:02:12.000] -----------------------------------------------
 Info 50   [00:02:13.000] Open files: 
 Info 50   [00:02:14.000] 	FileName: /app.js ProjectRootPath: undefined
 Info 50   [00:02:15.000] 		Projects: /jsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js
index 36381205b8548..ba96f17fdd3e0 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules-explicit-types.js
@@ -210,7 +210,9 @@ Info 48   [00:01:52.000] -----------------------------------------------
 Info 48   [00:01:53.000] Open files: 
 Info 48   [00:01:54.000] 	FileName: /app.js ProjectRootPath: undefined
 Info 48   [00:01:55.000] 		Projects: /jsconfig.json
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+5: /jsconfig.json
+6: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /a/lib/lib.d.ts:
@@ -256,4 +258,4 @@ Info 52   [00:02:14.000] -----------------------------------------------
 Info 52   [00:02:15.000] Open files: 
 Info 52   [00:02:16.000] 	FileName: /app.js ProjectRootPath: undefined
 Info 52   [00:02:17.000] 		Projects: /jsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js
index 4a00390d5ecf5..1e4e879ce5f97 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/discover-from-node_modules.js
@@ -260,7 +260,9 @@ Info 58   [00:02:27.000] Scheduled: /jsconfig.json, Cancelled earlier one
 Info 59   [00:02:28.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:02:29.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/jsconfig.json","packagesToInstall":["@types/jquery@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+13: /jsconfig.json
+14: *ensureProjectForOpenFiles*
 
 Info 60   [00:02:30.000] Running: /jsconfig.json
 Info 61   [00:02:31.000] Starting updateGraphWorker: Project: /jsconfig.json
@@ -320,4 +322,4 @@ Info 72   [00:03:09.000] -----------------------------------------------
 Info 72   [00:03:10.000] Open files: 
 Info 72   [00:03:11.000] 	FileName: /app.js ProjectRootPath: undefined
 Info 72   [00:03:12.000] 		Projects: /jsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
index 3f1ee89501f18..1796971474453 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/expired-cache-entry.js
@@ -129,7 +129,9 @@ Info 9    [00:01:25.000] Scheduled: /dev/null/inferredProject1*
 Info 10   [00:01:26.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:27.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/jquery@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 11   [00:01:28.000] Running: /dev/null/inferredProject1*
 Info 12   [00:01:29.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -175,4 +177,4 @@ Info 20   [00:01:56.000] -----------------------------------------------
 Info 20   [00:01:57.000] Open files: 
 Info 20   [00:01:58.000] 	FileName: /a/b/app.js ProjectRootPath: undefined
 Info 20   [00:01:59.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js
index 2c6f813710724..57f15adbb72a7 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-no-type-acquisition.js
@@ -174,7 +174,8 @@ TI:: [00:01:25.000] Sending response:
 Info 11   [00:01:26.000] Scheduled: /a/app/test.csproj
 TI:: [00:01:27.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/a/app/test.csproj","packagesToInstall":["@types/lodash@tsFakeMajor.Minor","@types/react@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: /a/app/test.csproj
 
 Info 12   [00:01:28.000] Running: /a/app/test.csproj
 Info 13   [00:01:29.000] Starting updateGraphWorker: Project: /a/app/test.csproj
@@ -210,4 +211,4 @@ TI:: [00:01:43.000] Finished typings discovery: {"cachedTypingPaths":["/a/data/n
 TI:: [00:01:44.000] Sending response:
     {"projectName":"/a/app/test.csproj","typeAcquisition":{"include":["lodash"],"exclude":[],"enable":true},"compilerOptions":{"allowJS":true,"moduleResolution":2,"allowNonTsExtensions":true,"noEmitForJsFiles":true},"typings":["/a/data/node_modules/@types/lodash/index.d.ts","/a/data/node_modules/@types/react/index.d.ts"],"unresolvedImports":[],"kind":"action::set"}
 TI:: [00:01:45.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js
index 21107a8cdc5a6..97d83f6336f51 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/external-projects-type-acquisition.js
@@ -203,7 +203,8 @@ TI:: [00:01:38.000] Sending response:
 Info 11   [00:01:39.000] Scheduled: /a/app/test.csproj
 TI:: [00:01:40.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/a/app/test.csproj","packagesToInstall":["@types/jquery@tsFakeMajor.Minor","@types/moment@tsFakeMajor.Minor","@types/commander@tsFakeMajor.Minor","@types/express@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: /a/app/test.csproj
 
 Info 12   [00:01:41.000] Running: /a/app/test.csproj
 Info 13   [00:01:42.000] Starting updateGraphWorker: Project: /a/app/test.csproj
@@ -243,4 +244,4 @@ TI:: [00:01:57.000] Finished typings discovery: {"cachedTypingPaths":["/a/data/n
 TI:: [00:01:58.000] Sending response:
     {"projectName":"/a/app/test.csproj","typeAcquisition":{"enable":true,"include":["jquery","moment","lodash","commander"],"exclude":["lodash"]},"compilerOptions":{"allowJS":true,"moduleResolution":2,"allowNonTsExtensions":true,"noEmitForJsFiles":true},"typings":["/a/data/node_modules/@types/jquery/index.d.ts","/a/data/node_modules/@types/moment/index.d.ts","/a/data/node_modules/@types/commander/index.d.ts","/a/data/node_modules/@types/express/index.d.ts"],"unresolvedImports":[],"kind":"action::set"}
 TI:: [00:01:59.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js
index d1591c581039f..15b772167dda4 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects-with-disableFilenameBasedTypeAcquisition.js
@@ -84,7 +84,8 @@ Info 11   [00:00:57.000] -----------------------------------------------
 Info 11   [00:00:58.000] Open files: 
 Info 11   [00:00:59.000] 	FileName: /a/b/jquery.js ProjectRootPath: undefined
 Info 11   [00:01:00.000] 		Projects: /dev/null/inferredProject1*
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 PolledWatches::
 /a/lib/lib.d.ts:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
index 3dbb71342f66e..bd0aef97b8121 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/inferred-projects.js
@@ -130,7 +130,9 @@ Info 9    [00:01:26.000] Scheduled: /dev/null/inferredProject1*
 Info 10   [00:01:27.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:28.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/jquery@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 11   [00:01:29.000] Running: /dev/null/inferredProject1*
 Info 12   [00:01:30.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -176,4 +178,4 @@ Info 20   [00:01:57.000] -----------------------------------------------
 Info 20   [00:01:58.000] Open files: 
 Info 20   [00:01:59.000] 	FileName: /a/b/app.js ProjectRootPath: undefined
 Info 20   [00:02:00.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js b/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js
index 116798b9a98a4..f29e8a3ebe8fc 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/install-typings-for-unresolved-imports.js
@@ -138,7 +138,9 @@ Info 13   [00:01:25.000] Scheduled: /dev/null/inferredProject1*
 Info 14   [00:01:26.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:27.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/commander@tsFakeMajor.Minor","@types/node@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 15   [00:01:28.000] Running: /dev/null/inferredProject1*
 Info 16   [00:01:29.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -176,4 +178,6 @@ TI:: [00:01:42.000] Sending response:
 Info 21   [00:01:43.000] Scheduled: /dev/null/inferredProject1*
 Info 22   [00:01:44.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:01:45.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js
index c59b6bd749ae0..3324b54425533 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions-with-trimmed-names.js
@@ -144,7 +144,9 @@ Info 15   [00:01:32.000] Scheduled: /dev/null/inferredProject1*
 Info 16   [00:01:33.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:34.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/foo@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 17   [00:01:35.000] Running: /dev/null/inferredProject1*
 Info 18   [00:01:36.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -188,7 +190,9 @@ TI:: [00:01:51.000] Sending response:
 Info 23   [00:01:52.000] Scheduled: /dev/null/inferredProject1*
 Info 24   [00:01:53.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:01:54.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
 
 Info 25   [00:01:55.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info 26   [00:01:56.000] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
@@ -226,7 +230,9 @@ TI:: [00:02:09.000] Finished typings discovery: {"cachedTypingPaths":[],"newTypi
 TI:: [00:02:10.000] Sending response:
     {"projectName":"/dev/null/inferredProject1*","typeAcquisition":{"enable":true,"include":[],"exclude":[]},"compilerOptions":{"target":1,"jsx":1,"allowNonTsExtensions":true,"allowJs":true,"noEmitForJsFiles":true,"maxNodeModuleJsDepth":2},"typings":[],"unresolvedImports":[],"kind":"action::set"}
 TI:: [00:02:11.000] No new typings were requested as a result of typings discovery
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
 
 Info 30   [00:02:12.000] Running: /dev/null/inferredProject1*
 Info 31   [00:02:13.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -272,6 +278,7 @@ Info 39   [00:02:43.000] -----------------------------------------------
 Info 39   [00:02:44.000] Open files: 
 Info 39   [00:02:45.000] 	FileName: /a/b/app.js ProjectRootPath: undefined
 Info 39   [00:02:46.000] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js
index 6ec4d43b2cb54..e5ebc4dad6fd8 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/invalidate-the-resolutions.js
@@ -131,7 +131,9 @@ Info 15   [00:01:24.000] Scheduled: /dev/null/inferredProject1*
 Info 16   [00:01:25.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:26.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/foo@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 17   [00:01:27.000] Running: /dev/null/inferredProject1*
 Info 18   [00:01:28.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -167,7 +169,9 @@ TI:: [00:01:43.000] Sending response:
 Info 23   [00:01:44.000] Scheduled: /dev/null/inferredProject1*
 Info 24   [00:01:45.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:01:46.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
 
 Info 25   [00:01:47.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info 26   [00:01:48.000] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
@@ -199,7 +203,9 @@ TI:: [00:02:01.000] Finished typings discovery: {"cachedTypingPaths":[],"newTypi
 TI:: [00:02:02.000] Sending response:
     {"projectName":"/dev/null/inferredProject1*","typeAcquisition":{"enable":true,"include":[],"exclude":[]},"compilerOptions":{"target":1,"jsx":1,"allowNonTsExtensions":true,"allowJs":true,"noEmitForJsFiles":true,"maxNodeModuleJsDepth":2},"typings":[],"unresolvedImports":[],"kind":"action::set"}
 TI:: [00:02:03.000] No new typings were requested as a result of typings discovery
-Before running timeout callbacks
+Before running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
 
 Info 30   [00:02:04.000] Running: /dev/null/inferredProject1*
 Info 31   [00:02:05.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -243,6 +249,7 @@ Info 39   [00:02:35.000] -----------------------------------------------
 Info 39   [00:02:36.000] Open files: 
 Info 39   [00:02:37.000] 	FileName: /a/b/app.js ProjectRootPath: undefined
 Info 39   [00:02:38.000] 		Projects: /dev/null/inferredProject1*
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js b/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js
index dd95619e60b62..4dca4bfff27e4 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/malformed-packagejson.js
@@ -114,7 +114,8 @@ TI:: [00:01:27.000] #1 with arguments'["@types/commander@tsFakeMajor.Minor"]'.
 TI:: [00:01:28.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/package.json 1:: WatchInfo: /a/b/package.json 2000 undefined Project: /dev/null/inferredProject1* watcher already invoked: false
 Info 12   [00:01:29.000] FileWatcher:: Triggered with /a/b/package.json 1:: WatchInfo: /a/b/package.json 250 undefined WatchType: package.json file
 Info 13   [00:01:30.000] Elapsed:: *ms FileWatcher:: Triggered with /a/b/package.json 1:: WatchInfo: /a/b/package.json 250 undefined WatchType: package.json file
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/a/b/package.json]
 { "dependencies": { "commander": "0.0.2" } }
 
@@ -149,7 +150,9 @@ Info 14   [00:01:41.000] Scheduled: /dev/null/inferredProject1*
 Info 15   [00:01:42.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:43.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/commander@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 16   [00:01:44.000] Running: /dev/null/inferredProject1*
 Info 17   [00:01:45.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -195,4 +198,4 @@ Info 25   [00:02:12.000] -----------------------------------------------
 Info 25   [00:02:13.000] Open files: 
 Info 25   [00:02:14.000] 	FileName: /a/b/app.js ProjectRootPath: undefined
 Info 25   [00:02:15.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js b/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js
index 203154497d06d..f1a9f0ee7804d 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/progress-notification.js
@@ -127,7 +127,9 @@ Info 12   [00:01:20.000] Scheduled: /dev/null/inferredProject1*
 Info 13   [00:01:21.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:22.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/commander@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 14   [00:01:23.000] Running: /dev/null/inferredProject1*
 Info 15   [00:01:24.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -173,4 +175,4 @@ Info 23   [00:01:51.000] -----------------------------------------------
 Info 23   [00:01:52.000] Open files: 
 Info 23   [00:01:53.000] 	FileName: /a/app.js ProjectRootPath: undefined
 Info 23   [00:01:54.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js b/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
index 403d6a808bd36..4f8ce9d2b0e24 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
@@ -166,7 +166,9 @@ Info 23   [00:01:38.000] Scheduled: /dev/null/inferredProject1*
 Info 24   [00:01:39.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:40.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/commander@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 25   [00:01:41.000] Running: /dev/null/inferredProject1*
 Info 26   [00:01:42.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -199,7 +201,9 @@ TI:: [00:01:57.000] Sending response:
 Info 33   [00:01:58.000] Scheduled: /dev/null/inferredProject1*
 Info 34   [00:01:59.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:02:00.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /user/username/projects/a/b/tsconfig.json:
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js b/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js
index 2912b087ae525..c64e69de4858a 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/scoped-name-discovery.js
@@ -257,7 +257,9 @@ Info 58   [00:02:25.000] Scheduled: /jsconfig.json, Cancelled earlier one
 Info 59   [00:02:26.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:02:27.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/jsconfig.json","packagesToInstall":["@types/zkat__cacache@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+13: /jsconfig.json
+14: *ensureProjectForOpenFiles*
 
 Info 60   [00:02:28.000] Running: /jsconfig.json
 Info 61   [00:02:29.000] Starting updateGraphWorker: Project: /jsconfig.json
@@ -296,4 +298,6 @@ TI:: [00:02:51.000] Sending response:
     {"projectName":"/jsconfig.json","typeAcquisition":{"enable":true,"include":[],"exclude":[]},"compilerOptions":{"allowJs":true,"maxNodeModuleJsDepth":2,"allowSyntheticDefaultImports":true,"skipLibCheck":true,"noEmit":true,"configFilePath":"/jsconfig.json","allowNonTsExtensions":true},"typings":[],"unresolvedImports":[],"kind":"action::set"}
 Info 69   [00:02:52.000] Scheduled: /jsconfig.json
 Info 70   [00:02:53.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 2
+15: /jsconfig.json
+16: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js b/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js
index 422146e6d0db4..f7c84dc5e9326 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/should-handle-node-core-modules.js
@@ -146,7 +146,9 @@ Info 13   [00:01:18.000] Scheduled: /dev/null/inferredProject1*
 Info 14   [00:01:19.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:20.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/node@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 15   [00:01:21.000] Running: /dev/null/inferredProject1*
 Info 16   [00:01:22.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -183,9 +185,13 @@ TI:: [00:01:37.000] Sending response:
 Info 23   [00:01:38.000] Scheduled: /dev/null/inferredProject1*
 Info 24   [00:01:39.000] Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 TI:: [00:01:40.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
 
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+3: /dev/null/inferredProject1*
+4: *ensureProjectForOpenFiles*
 
 Info 25   [00:01:41.000] Running: /dev/null/inferredProject1*
 Info 26   [00:01:42.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -237,9 +243,10 @@ Info 36   [00:02:12.000] -----------------------------------------------
 Info 36   [00:02:13.000] Open files: 
 Info 36   [00:02:14.000] 	FileName: /a/b/app.js ProjectRootPath: undefined
 Info 36   [00:02:15.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 
 Info 36   [00:02:16.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
 Info 37   [00:02:17.000] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 4 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
@@ -264,4 +271,5 @@ TI:: [00:02:31.000] 's tream':: 's tream' is in missingTypingsSet - skipping...
 TI:: [00:02:32.000] All typings are known to be missing or invalid - no need to install more typings
 TI:: [00:02:33.000] Sending response:
     {"projectName":"/dev/null/inferredProject1*","typeAcquisition":{"enable":true,"include":[],"exclude":[]},"compilerOptions":{"target":1,"jsx":1,"allowNonTsExtensions":true,"allowJs":true,"noEmitForJsFiles":true,"maxNodeModuleJsDepth":2},"typings":[],"unresolvedImports":["bar","s tream"],"kind":"action::set"}
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js b/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js
index 102caf8471742..c45fd4a76b720 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/telemetry-events.js
@@ -124,7 +124,9 @@ Info 12   [00:01:18.000] Scheduled: /dev/null/inferredProject1*
 Info 13   [00:01:19.000] Scheduled: *ensureProjectForOpenFiles*
 TI:: [00:01:20.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/dev/null/inferredProject1*","packagesToInstall":["@types/commander@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /dev/null/inferredProject1*
+2: *ensureProjectForOpenFiles*
 
 Info 14   [00:01:21.000] Running: /dev/null/inferredProject1*
 Info 15   [00:01:22.000] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
@@ -170,4 +172,4 @@ Info 23   [00:01:49.000] -----------------------------------------------
 Info 23   [00:01:50.000] Open files: 
 Info 23   [00:01:51.000] 	FileName: /a/app.js ProjectRootPath: undefined
 Info 23   [00:01:52.000] 		Projects: /dev/null/inferredProject1*
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js
index 9db5e3420048c..205d31ae8e4de 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-run-install-requests.js
@@ -267,7 +267,9 @@ TI:: [00:02:12.000] Sending response:
 Info 20   [00:02:13.000] Scheduled: /a/app/test2.csproj
 TI:: [00:02:14.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":2,"projectName":"/a/app/test2.csproj","packagesToInstall":["@types/grunt@tsFakeMajor.Minor","@types/gulp@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (2) and running
+Before running Timeout callback:: count: 2
+1: /a/app/test1.csproj
+2: /a/app/test2.csproj
 
 Info 21   [00:02:15.000] Running: /a/app/test1.csproj
 Info 22   [00:02:16.000] Starting updateGraphWorker: Project: /a/app/test1.csproj
@@ -334,4 +336,4 @@ TI:: [00:02:45.000] Finished typings discovery: {"cachedTypingPaths":["/a/data/n
 TI:: [00:02:46.000] Sending response:
     {"projectName":"/a/app/test2.csproj","typeAcquisition":{"include":["grunt","gulp"],"exclude":[],"enable":true},"compilerOptions":{"allowJS":true,"moduleResolution":2,"allowNonTsExtensions":true,"noEmitForJsFiles":true},"typings":["/a/data/node_modules/@types/grunt/index.d.ts","/a/data/node_modules/@types/gulp/index.d.ts"],"unresolvedImports":[],"kind":"action::set"}
 TI:: [00:02:47.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (2) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js
index c0cece5dca6d4..e7899d25853c5 100644
--- a/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js
+++ b/tests/baselines/reference/tsserver/typingsInstaller/throttle-delayed-typings-to-install.js
@@ -216,7 +216,8 @@ TI:: [00:01:41.000] Sending response:
 Info 11   [00:01:42.000] Scheduled: /a/app/test.csproj
 TI:: [00:01:43.000] Sending response:
     {"kind":"event::endInstallTypes","eventId":1,"projectName":"/a/app/test.csproj","packagesToInstall":["@types/jquery@tsFakeMajor.Minor","@types/moment@tsFakeMajor.Minor","@types/lodash@tsFakeMajor.Minor","@types/commander@tsFakeMajor.Minor","@types/express@tsFakeMajor.Minor"],"installSuccess":true,"typingsInstallerVersion":"FakeVersion"}
-Before checking timeout queue length (1) and running
+Before running Timeout callback:: count: 1
+1: /a/app/test.csproj
 
 Info 12   [00:01:44.000] Running: /a/app/test.csproj
 Info 13   [00:01:45.000] Starting updateGraphWorker: Project: /a/app/test.csproj
@@ -258,4 +259,4 @@ TI:: [00:01:59.000] Finished typings discovery: {"cachedTypingPaths":["/a/data/n
 TI:: [00:02:00.000] Sending response:
     {"projectName":"/a/app/test.csproj","typeAcquisition":{"include":["jquery","moment","lodash","commander"],"exclude":[],"enable":true},"compilerOptions":{"allowJS":true,"moduleResolution":2,"allowNonTsExtensions":true,"noEmitForJsFiles":true},"typings":["/a/data/node_modules/@types/jquery/index.d.ts","/a/data/node_modules/@types/moment/index.d.ts","/a/data/node_modules/@types/lodash/index.d.ts","/a/data/node_modules/@types/commander/index.d.ts","/a/data/node_modules/@types/express/index.d.ts"],"unresolvedImports":[],"kind":"action::set"}
 TI:: [00:02:01.000] No new typings were requested as a result of typings discovery
-After checking timeout queue length (1) and running
+After running Timeout callback:: count: 0
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
index e8e0476a29e1c..8670c7d5cefca 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
@@ -107,27 +107,32 @@ FsWatches::
 /a/lib/lib.d.ts: *new*
   {}
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/a/username/project/node_modules/.cache/someFile.d.ts]
 
 
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/a/username/project/node_modules/.cacheFile.ts]
 
 
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/a/username/project/.git/someFile.d.ts]
 
 
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/a/username/project/.gitCache.d.ts]
 
 
 
-Checking timeout queue length: 0
+Timeout callback:: count: 0
+Immedidate callback:: count: 0
 //// [/a/username/project/src/.#field.ts]
 
 
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js
index 5c7848267bbe3..2c8d992bf7a24 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js
@@ -130,7 +130,8 @@ Info 24   [00:00:51.000] response:
     }
 After request
 
-Before running timeout callbacks
+Before running Timeout callback:: count: 1
+1: pollPollingIntervalQueue
 //// [/a/username/project/src/file2.ts]
 
 
@@ -142,7 +143,12 @@ Info 28   [00:00:57.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/user
 Info 29   [00:00:58.000] DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 30   [00:00:59.000] Scheduled: /a/username/project/tsconfig.jsonFailedLookupInvalidation
 Info 31   [00:01:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
-After running timeout callbacks
+After running Timeout callback:: count: 5
+2: /a/username/project/tsconfig.json
+3: *ensureProjectForOpenFiles*
+4: /a/username/project/tsconfig.jsonFailedLookupInvalidation
+5: pollLowPollingIntervalQueue
+6: pollPollingIntervalQueue
 
 Before request
 
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
index d54026fe40bc7..bf1770fcb49e2 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
@@ -145,7 +145,10 @@ Info 28   [00:00:57.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/user
 Info 29   [00:00:58.000] DirectoryWatcher:: Triggered with /a/username/project/src/file2.ts :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 30   [00:00:59.000] Scheduled: /a/username/project/tsconfig.jsonFailedLookupInvalidation
 Info 31   [00:01:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src/file2.ts :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /a/username/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: /a/username/project/tsconfig.jsonFailedLookupInvalidation
 //// [/a/username/project/src/file2.ts]
 
 
@@ -190,7 +193,7 @@ Info 42   [00:01:19.000] -----------------------------------------------
 Info 42   [00:01:20.000] Open files: 
 Info 42   [00:01:21.000] 	FileName: /a/username/project/src/index.ts ProjectRootPath: undefined
 Info 42   [00:01:22.000] 		Projects: /a/username/project/tsconfig.json
-After running timeout callbacks
+After running Timeout callback:: count: 0
 
 PolledWatches::
 /a/username/project/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js
index 188a951293d41..e75f7113a7f27 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js
@@ -145,7 +145,10 @@ Info 28   [00:00:57.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/user
 Info 29   [00:00:58.000] DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
 Info 30   [00:00:59.000] Scheduled: /a/username/project/tsconfig.jsonFailedLookupInvalidation
 Info 31   [00:01:00.000] Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
-Before running timeout callbacks
+Before running Timeout callback:: count: 3
+1: /a/username/project/tsconfig.json
+2: *ensureProjectForOpenFiles*
+3: /a/username/project/tsconfig.jsonFailedLookupInvalidation
 //// [/a/username/project/src/file2.ts]
 
 
@@ -174,7 +177,8 @@ Info 38   [00:01:07.000] 	Files (4)
 	  Matched by default include pattern '**/*'
 
 Info 39   [00:01:08.000] -----------------------------------------------
-After running timeout callbacks
+After running Timeout callback:: count: 1
+4: *ensureProjectForOpenFiles*
 
 PolledWatches::
 /a/username/project: