test: Make machines testing a bit more robust
test: Make machines testing a bit more robust

Also simplify some of the code and make it a bit less
verbose by default.

Closes #5916

larskarlitski/cockpit,petervo/cockpit,xhad/cockpit,cockpituous/cockpit,martinpitt/cockpit,Scribery/cockpit,martinpitt/cockpit,xhad/cockpit,larsu/cockpit,cockpituous/cockpit,larsu/cockpit,mvollmer/cockpit,deryni/cockpit,xhad/cockpit,petervo/cockpit,xhad/cockpit,cockpituous/cockpit,Scribery/cockpit,andreasn/cockpit,mareklibra/cockpit,petervo/cockpit,larskarlitski/cockpit,SotolitoLabs/cockpit,andreasn/cockpit,cockpituous/cockpit,garrett/cockpit,stefwalter/cockpit,michalskrivanek/cockpit,larsu/cockpit,andreasn/cockpit,petervo/cockpit,martinpitt/cockpit,mareklibra/cockpit,michalskrivanek/cockpit,moraleslazaro/cockpit,cockpit-project/cockpit,garrett/cockpit,harishanand95/cockpit,cockpit-project/cockpit,moraleslazaro/cockpit,xhad/cockpit,dperpeet/cockpit,petervo/cockpit,stefwalter/cockpit,xhad/cockpit,dperpeet/cockpit,cockpit-project/cockpit,deryni/cockpit,dperpeet/cockpit,larskarlitski/cockpit,mareklibra/cockpit,moraleslazaro/cockpit,SotolitoLabs/cockpit,cockpituous/cockpit,harishanand95/cockpit,mareklibra/cockpit,harishanand95/cockpit,SotolitoLabs/cockpit,garrett/cockpit,martinpitt/cockpit,garrett/cockpit,larskarlitski/cockpit,stefwalter/cockpit,andreasn/cockpit,mareklibra/cockpit,stefwalter/cockpit,mvollmer/cockpit,andreasn/cockpit,moraleslazaro/cockpit,moraleslazaro/cockpit,petervo/cockpit,harishanand95/cockpit,dperpeet/cockpit,michalskrivanek/cockpit,Scribery/cockpit,dperpeet/cockpit,cockpit-project/cockpit,deryni/cockpit,stefwalter/cockpit,mvollmer/cockpit,larsu/cockpit,deryni/cockpit,SotolitoLabs/cockpit,Scribery/cockpit,mvollmer/cockpit,michalskrivanek/cockpit,harishanand95/cockpit,larskarlitski/cockpit,SotolitoLabs/cockpit,stefwalter/cockpit,larskarlitski/cockpit,andreasn/cockpit,deryni/cockpit,Scribery/cockpit,garrett/cockpit,moraleslazaro/cockpit,deryni/cockpit,SotolitoLabs/cockpit,deryni/cockpit,michalskrivanek/cockpit,michalskrivanek/cockpit,mareklibra/cockpit,cockpituous/cockpit,SotolitoLabs/cockpit,Scribery/cockpit,larskarlitski/cockpit,michalskrivanek/cockpit,larsu/cockpit,xhad/cockpit,larsu/cockpit,petervo/cockpit,dperpeet/cockpit,harishanand95/cockpit,martinpitt/cockpit,dperpeet/cockpit,harishanand95/cockpit,mareklibra/cockpit,stefwalter/cockpit,mvollmer/cockpit,cockpit-project/cockpit,andreasn/cockpit,Scribery/cockpit,moraleslazaro/cockpit