[Fix] Broken tests after r211796.