Removed the flakiness from some tests