Fixed test and built