Less DB queries in test factories

8 jobs for faster-tests in 2 minutes and 27 seconds (queued for 1 second)