Fix #1710 #770

Job	Run time
tests (windows-latest)	12m 28s
tests (ubuntu-latest)	4m 7s
tests (macos-latest)	5m 7s
build (ubuntu-latest, build:linux)	3m 34s
build (macos-latest, build:macos-arm64)	3m 39s
build (macos-13, build:macos)	3m 49s
build (windows-latest, build:windows)	3m 42s
	36m 26s

Provide feedback