Fixed test build errors