Fixed test compile failures