Fixed test site definitions.