Fix multiple test breaks.