Fix & improve units test (#1603)

7 jobs for master in 10 minutes and 48 seconds (queued for 2 seconds)