Update gems, remove flakiness