Refactor with getDefaultDataSourceId$ (#197) (#198) #716

Job	Run time
Run unit tests (macos-latest)	12m 37s
Run unit tests (windows-latest)	11m 21s
Get-CI-Image-Tag / Get-CI-Image-Tag	7s
Run unit tests	6m 36s
	30m 41s

Provide feedback