The tests are pretty unreadable and need a general tidy. This also hopefully handled more instances in test non-determinism.