Fixed test breaks