tidy up+ #5653

Job	Run time
debug_all_tests (macos-latest)	25m 55s
debug (macos-latest)	13m 57s
debug64_all_tests (macos-latest)	32m 33s
release (macos-latest)	37m 5s
debug64 (macos-latest)	19m 3s
release_all_tests (macos-latest)	26m 31s
Release64 (macos-latest)	23m 48s
Release64_all_tests (macos-latest)	16m 13s
	3h 15m 5s

Provide feedback