Various fixes based on PR review #2333

Job	Run time
Execution tests (3.8, windows-latest)	6m 19s
Unit tests (3.8, windows-latest)	7m 15s
Execution tests (3.8, ubuntu-22.04)	2m 6s
Unit tests (3.8, ubuntu-22.04)	5m 36s
Execution tests (3.9, windows-latest)	5m 55s
Unit tests (3.9, windows-latest)	9m 1s
Execution tests (3.9, ubuntu-22.04)	3m 9s
Unit tests (3.9, ubuntu-22.04)	5m 19s
Execution tests (3.10, windows-latest)	5m 3s
Unit tests (3.10, windows-latest)	8m 19s
Execution tests (3.10, ubuntu-22.04)	2m 44s
Unit tests (3.10, ubuntu-22.04)	5m 8s
Execution tests (3.11, windows-latest)	6m 13s
Unit tests (3.11, windows-latest)	9m 10s
Execution tests (3.11, ubuntu-22.04)	2m 13s
Unit tests (3.11, ubuntu-22.04)	5m 2s
Execution tests (3.12, windows-latest)	5m 56s
Unit tests (3.12, windows-latest)	10m 46s
Execution tests (3.12, ubuntu-22.04)	2m 38s
Unit tests (3.12, ubuntu-22.04)	6m 17s
	1h 54m 9s

Provide feedback