Remove a bit more test flakyness