Fix breaking changes after test improves #3187

Job	Run time
Pretest	3m 31s
GitHub Integration Tests	4m 48s
Unit Tests (ubuntu)	2m 12s
Bitbucket Server Integration Tests	5m 13s
Azure Integration Tests (ubuntu)	5m 9s
GitLab Integration Tests (ubuntu)	7m 29s
Azure Integration Tests (windows)	8m 10s
Unit Tests (windows)	12m 29s
GitLab Integration Tests (windows)	6m 48s
Azure Integration Tests (macos)	5m 54s
Unit Tests (macos)	8m 47s
GitLab Integration Tests (macos)	7m 15s
Scan Repository Tests (ubuntu)	14m 27s
Scan Repository Tests (windows)	24m 20s
Scan Repository Tests (macos)	18m 37s
Scan Pull Request Tests (ubuntu)	19m 26s
Scan Pull Request Tests (windows)	29m 29s
Scan Pull Request Tests (macos)	21m 13s
Package Handlers Tests (ubuntu)	4m 45s
Package Handlers Tests (windows)	13m 51s
Package Handlers Tests (macos)	4m 16s
	3h 48m 9s

Provide feedback