Reworked the test a little bit so it's less fragile (less depends on the progress output)