Fix tests and behavior

12 jobs for improve-build-setup in 27 minutes and 59 seconds (queued for 2 seconds)