Fix tests

3 jobs for master in 24 minutes and 22 seconds (queued for 12 seconds)