This reverts commit2dbd08dcbd. I've fixed the regression in8a7a8442c1and the rest of my refactorings/improvements shouldn't affect the stability of the test.
*** NixOS *** NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at https://nixos.org/nixos and in the manual in doc/manual.